/hg/icedtea7-forest/corba: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 15 02:29:36 UTC 2015
changeset 177c0f0553e6 in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=177c0f0553e6
author: andrew
date: Wed Jul 15 03:21:42 2015 +0100
Added tag icedtea-2.6.0 for changeset e3445769412d
changeset 04fa81933b34 in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=04fa81933b34
author: andrew
date: Fri Jul 03 23:53:28 2015 +0100
8014464: Update jcheck for OpenJDK 7
Reviewed-by: omajid
changeset 02c5cee149d9 in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=02c5cee149d9
author: msheppar
date: Mon Apr 20 00:46:38 2015 +0100
8076376: Enhance IIOP operations
Reviewed-by: rriggs, coffeys, ahgross, skoivu
changeset a1436e2c0aa8 in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=a1436e2c0aa8
author: andrew
date: Wed Jul 08 21:51:24 2015 +0100
Added tag jdk7u85-b00 for changeset 02c5cee149d9
changeset 49c612f37361 in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=49c612f37361
author: andrew
date: Thu Jul 09 02:11:52 2015 +0100
Merge jdk7u85-b00
changeset c5342e350920 in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=c5342e350920
author: andrew
date: Sat Jul 11 16:20:16 2015 +0100
Added tag jdk7u85-b01 for changeset a1436e2c0aa8
changeset 0c7c745caea1 in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=0c7c745caea1
author: andrew
date: Sat Jul 11 16:28:13 2015 +0100
Merge jdk7u85-b01
changeset e44f97ff92bd in /hg/icedtea7-forest/corba
details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=e44f97ff92bd
author: andrew
date: Wed Jul 15 03:26:56 2015 +0100
Merge
diffstat:
.hgtags | 3 +
src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java | 167 +++++++--
2 files changed, 129 insertions(+), 41 deletions(-)
diffs (271 lines):
diff -r 68c84058be4a -r e44f97ff92bd .hgtags
--- a/.hgtags Wed Jul 08 13:17:24 2015 +0100
+++ b/.hgtags Wed Jul 15 03:26:56 2015 +0100
@@ -636,3 +636,6 @@
a97bddc81932c9772184182297291abacccc85c0 jdk7u80-b32
9d5c92264131bcac8d8a032c055080cf51b18202 icedtea-2.6pre23
e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6pre24
+e3445769412d69411988241bef34fd1d652a37d1 icedtea-2.6.0
+02c5cee149d94496124f794b7ef89d860b8710ee jdk7u85-b00
+a1436e2c0aa8c35b4c738004d19549df54448621 jdk7u85-b01
diff -r 68c84058be4a -r e44f97ff92bd src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
--- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Jul 08 13:17:24 2015 +0100
+++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java Wed Jul 15 03:26:56 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