/hg/release/icedtea7-forest-2.5/corba: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 20 15:45:31 UTC 2015
changeset a146d87ff390 in /hg/release/icedtea7-forest-2.5/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=a146d87ff390
author: msheppar
date: Mon Apr 20 00:46:38 2015 +0100
8076376: Enhance IIOP operations
Reviewed-by: rriggs, coffeys, ahgross, skoivu
changeset d9e6a705d934 in /hg/release/icedtea7-forest-2.5/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=d9e6a705d934
author: andrew
date: Mon Jul 20 16:43:54 2015 +0100
Added tag icedtea-2.5.6 for changeset a146d87ff390
diffstat:
.hgtags | 1 +
src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 167 +++++++--
2 files changed, 127 insertions(+), 41 deletions(-)
diffs (269 lines):
diff -r cc6cec571006 -r d9e6a705d934 .hgtags
--- a/.hgtags Sat Jul 18 00:45:24 2015 +0100
+++ b/.hgtags Mon Jul 20 16:43:54 2015 +0100
@@ -576,3 +576,4 @@
52db6f325d617296e61638f93235ac88039ca182 icedtea-2.5.5
d4586b6d7058374f4d8aab96bbdf703368c0a65e icedtea-2.5.6pre01
85c15dd407533ced95f6a5fc734e4cbc4480230d icedtea-2.5.6pre02
+a146d87ff390dfdbf8c25ed301a5b435ceb5cfa1 icedtea-2.5.6
diff -r cc6cec571006 -r d9e6a705d934 src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Sat Jul 18 00:45:24 2015 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Mon Jul 20 16:43:54 2015 +0100
@@ -2417,8 +2417,8 @@
private void throwAwayData(ValueMember[] fields,
com.sun.org.omg.SendingContext.CodeBase sender)
throws InvalidClassException, StreamCorruptedException,
- ClassNotFoundException, IOException
- {
+ ClassNotFoundException, IOException {
+
for (int i = 0; i < fields.length; ++i) {
try {
@@ -2553,8 +2553,7 @@
}
- private static void setObjectField(Object o, Class c, String fieldName, Object v)
- {
+ private static void setObjectField(Object o, Class c, String fieldName, Object v) {
try {
Field fld = c.getDeclaredField( fieldName ) ;
Class fieldCl = fld.getType();
@@ -2564,9 +2563,15 @@
long key = bridge.objectFieldOffset( fld ) ;
bridge.putObject( o, key, v ) ;
} catch (Exception e) {
- throw utilWrapper.errorSetObjectField( e, fieldName,
- o.toString(),
- v.toString() ) ;
+ if (o != null) {
+ throw utilWrapper.errorSetObjectField( e, fieldName,
+ o.toString(),
+ v.toString() ) ;
+ } else {
+ throw utilWrapper.errorSetObjectField( e, fieldName,
+ "null " + c.getName() + " object",
+ v.toString() ) ;
+ }
}
}
@@ -2574,12 +2579,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putBoolean( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Boolean.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putBoolean( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
+ if (o != null) {
throw utilWrapper.errorSetBooleanField( e, fieldName,
o.toString(),
new Boolean(v) ) ;
+ } else {
+ throw utilWrapper.errorSetBooleanField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Boolean(v) ) ;
+ }
}
}
@@ -2587,12 +2602,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putByte( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Byte.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putByte( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
- throw utilWrapper.errorSetByteField( e, fieldName,
- o.toString(),
- new Byte(v) ) ;
+ if (o != null) {
+ throw utilWrapper.errorSetByteField( e, fieldName,
+ o.toString(),
+ new Byte(v) ) ;
+ } else {
+ throw utilWrapper.errorSetByteField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Byte(v) ) ;
+ }
}
}
@@ -2600,12 +2625,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putChar( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Character.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putChar( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
- throw utilWrapper.errorSetCharField( e, fieldName,
- o.toString(),
- new Character(v) ) ;
+ if (o != null) {
+ throw utilWrapper.errorSetCharField( e, fieldName,
+ o.toString(),
+ new Character(v) ) ;
+ } else {
+ throw utilWrapper.errorSetCharField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Character(v) ) ;
+ }
}
}
@@ -2613,12 +2648,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putShort( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Short.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putShort( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
+ if (o != null) {
throw utilWrapper.errorSetShortField( e, fieldName,
o.toString(),
new Short(v) ) ;
+ } else {
+ throw utilWrapper.errorSetShortField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Short(v) ) ;
+ }
}
}
@@ -2626,12 +2671,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putInt( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Integer.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putInt( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
- throw utilWrapper.errorSetIntField( e, fieldName,
- o.toString(),
- new Integer(v) ) ;
+ if (o != null) {
+ throw utilWrapper.errorSetIntField( e, fieldName,
+ o.toString(),
+ new Integer(v) ) ;
+ } else {
+ throw utilWrapper.errorSetIntField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Integer(v) ) ;
+ }
}
}
@@ -2639,12 +2694,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putLong( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Long.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putLong( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
- throw utilWrapper.errorSetLongField( e, fieldName,
- o.toString(),
- new Long(v) ) ;
+ if (o != null) {
+ throw utilWrapper.errorSetLongField( e, fieldName,
+ o.toString(),
+ new Long(v) ) ;
+ } else {
+ throw utilWrapper.errorSetLongField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Long(v) ) ;
+ }
}
}
@@ -2652,12 +2717,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putFloat( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Float.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putFloat( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
- throw utilWrapper.errorSetFloatField( e, fieldName,
- o.toString(),
- new Float(v) ) ;
+ if (o != null) {
+ throw utilWrapper.errorSetFloatField( e, fieldName,
+ o.toString(),
+ new Float(v) ) ;
+ } else {
+ throw utilWrapper.errorSetFloatField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Float(v) ) ;
+ }
}
}
@@ -2665,12 +2740,22 @@
{
try {
Field fld = c.getDeclaredField( fieldName ) ;
- long key = bridge.objectFieldOffset( fld ) ;
- bridge.putDouble( o, key, v ) ;
+ if ((fld != null) && (fld.getType() == Double.TYPE)) {
+ long key = bridge.objectFieldOffset( fld ) ;
+ bridge.putDouble( o, key, v ) ;
+ } else {
+ throw new InvalidObjectException("Field Type mismatch");
+ }
} catch (Exception e) {
- throw utilWrapper.errorSetDoubleField( e, fieldName,
- o.toString(),
- new Double(v) ) ;
+ if (o != null) {
+ throw utilWrapper.errorSetDoubleField( e, fieldName,
+ o.toString(),
+ new Double(v) ) ;
+ } else {
+ throw utilWrapper.errorSetDoubleField( e, fieldName,
+ "null " + c.getName() + " object",
+ new Double(v) ) ;
+ }
}
}
More information about the distro-pkg-dev
mailing list