changeset 405:8c6cd047daa7

Merge
author asaha
date Thu, 27 Oct 2011 23:12:23 -0700
parents 12559bb704ed a966d5aad2ff
children 272372817c0a
files .hgtags
diffstat 2 files changed, 19 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 26 12:43:04 2011 -0700
+++ b/.hgtags	Thu Oct 27 23:12:23 2011 -0700
@@ -121,10 +121,20 @@
 7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
+36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
+dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
+eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
+07247d9e7778ff1609e264e3090150c4b3117c3a jdk7u1-b05
 960011ba4bf209a567d33f739b515acca7bb44b7 jdk7u2-b01
 e1a1c0d722646ef1430cdaa91c9c2057aa4491fa jdk7u2-b04
 391d8aa6f432178fc82da63c07909cb70a0af7df jdk7u2-b05
 e4907c890e422be490bbe70da498e57c814e4d54 jdk7u2-b06
 b872671d204384fc70da68d375f41753bac3c0e0 jdk7u2-b07
 9ef47d349684df6710864c4bc477c64fdd260d6a jdk7u2-b08
+ec2bc054bfad730de577f281cd2a556304a05ab5 jdk7u2-b09
+9d3e2884a1a378d4b99662e47e86c08db4ea6a82 jdk7u1-b06
+59c003227deb9dca331c590126abd25f5feed78b jdk7u1-b07
+49aecdae2fba1730b5eda4f249e194881f2ffa63 jdk7u1-b08
+82330ae1ba8b29384644db0e3385cab88aae59c2 jdk7u2-b11
--- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Wed Oct 26 12:43:04 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Thu Oct 27 23:12:23 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2243,6 +2243,10 @@
                 }
 
                 try {
+                    Class fieldCl = fields[i].getClazz();
+                    if (objectValue != null && !fieldCl.isInstance(objectValue)) {
+                        throw new IllegalArgumentException();
+                    }
                     bridge.putObject( o, fields[i].getFieldID(), objectValue ) ;
                     // reflective code: fields[i].getField().set( o, objectValue ) ;
                 } catch (IllegalArgumentException e) {
@@ -2553,6 +2557,10 @@
     {
         try {
             Field fld = c.getDeclaredField( fieldName ) ;
+            Class fieldCl = fld.getType();
+            if(v != null && !fieldCl.isInstance(v)) {
+                throw new Exception();
+            }
             long key = bridge.objectFieldOffset( fld ) ;
             bridge.putObject( o, key, v ) ;
         } catch (Exception e) {