Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/.hgtags	Wed May 27 13:20:52 2015 -0700
     1.2 +++ b/.hgtags	Thu May 28 20:39:11 2015 -0700
     1.3 @@ -352,6 +352,7 @@
     1.4  f89b454638d89ee5f44422b7a5b8e5651260e68f jdk8u31-b13
     1.5  705d3a4298f44f0a14925bfee5017f5824b6c0ca jdk8u31-b31
     1.6  072d325a052a5894019b74118803bf5fb9e30692 jdk8u31-b32
     1.7 +bfd820cde577ba687222196e6c5159d9763df887 jdk8u31-b33
     1.8  7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00
     1.9  c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01
    1.10  504b4455570e14b7fc0a837a09c6401c603516d9 jdk8u40-b02
    1.11 @@ -380,6 +381,8 @@
    1.12  2220744100b8487976debff79e5d0c7d70738bda jdk8u40-b25
    1.13  cab2b99c6bb2e15165a58eaa36157788f82592f1 jdk8u40-b26
    1.14  bd0186cd2419129357b110fe3f13519f68b29774 jdk8u40-b27
    1.15 +28a1dbd4bb9ec97427790c88d21514af2f878c94 jdk8u40-b31
    1.16 +663a3151c688bc3f4c092bcad21cc81e29139d62 jdk8u40-b32
    1.17  5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
    1.18  6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01
    1.19  3b9d342f9f584465ea5976e06357b45682f9681d jdk8u45-b02
    1.20 @@ -395,6 +398,24 @@
    1.21  c9bf2543c0c045ef31f0296bc355381e1a4bd4ac jdk8u45-b12
    1.22  326f02235e7a9a6da78428410320dcc980827d40 jdk8u45-b13
    1.23  50fb9bed64c9366b7bf68bddcdc553cd7295d905 jdk8u45-b14
    1.24 +4afc048fe6ff7fc3fdbdadd8027549805c426d0d jdk8u45-b15
    1.25 +e67045c893eaf5e3336c4fd849786fa15b81b601 jdk8u45-b31
    1.26 +f2aeb52cb7cef1f984661a583baac67402f633a5 jdk8u45-b32
    1.27 +72d116eea419824044f8dd4ae9d3a012946f72a4 jdk8u51-b00
    1.28 +b9638b9fe23876fd2413f336ee1d4e05d409e6a9 jdk8u51-b01
    1.29 +bc5562ed3c2d69ffbff357e96d9e383479042000 jdk8u51-b02
    1.30 +75c09ffd6c62f90153e4b043e0b40db4fa03954d jdk8u51-b03
    1.31 +66908961baaec267141b1e80d04feed0c93f68fe jdk8u51-b04
    1.32 +1c0a26d561f3a6b2d5a4c91161d7c92409d5f227 jdk8u51-b05
    1.33 +dba5c9ee56abce73e1f6ed99a36a99d6907266c6 jdk8u51-b06
    1.34 +00d57e68b59879ee59352ae18c7e40216d9e2243 jdk8u51-b07
    1.35 +47492841bb10e6c995c68be533d2b4905856a17e jdk8u51-b08
    1.36 +b9e5fa1d3f251d5cce02d1e7ff97279064aecdb1 jdk8u51-b09
    1.37 +0011162b38bf4dab36c72bf25640c59d7128274a jdk8u51-b10
    1.38 +4d59046bdb8a05cfb9e07d8e18d44956f700fe29 jdk8u51-b11
    1.39 +e51a2deadf774452d98b339d65d33c72a466a453 jdk8u51-b12
    1.40 +4886143e8749caf2ec42a6e77c70a98516e140a3 jdk8u51-b13
    1.41 +1fbfa02e524872a75e98ee3a80e2472fa7012fde jdk8u51-b14
    1.42  8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u60-b00
    1.43  15ae8298b34beb30f2bd7baa7ff895af2bec13f6 jdk8u60-b01
    1.44  a98524c04cbd24bbc3029b21c033abf9108e92b4 jdk8u60-b02

     2.1 --- a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Wed May 27 13:20:52 2015 -0700
     2.2 +++ b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java	Thu May 28 20:39:11 2015 -0700
     2.3 @@ -2417,8 +2417,8 @@
     2.4      private void throwAwayData(ValueMember[] fields,
     2.5                                 com.sun.org.omg.SendingContext.CodeBase sender)
     2.6          throws InvalidClassException, StreamCorruptedException,
     2.7 -               ClassNotFoundException, IOException
     2.8 -    {
     2.9 +               ClassNotFoundException, IOException {
    2.10 +
    2.11          for (int i = 0; i < fields.length; ++i) {
    2.12  
    2.13              try {
    2.14 @@ -2553,8 +2553,7 @@
    2.15  
    2.16      }
    2.17  
    2.18 -    private static void setObjectField(Object o, Class c, String fieldName, Object v)
    2.19 -    {
    2.20 +    private static void setObjectField(Object o, Class c, String fieldName, Object v) {
    2.21          try {
    2.22              Field fld = c.getDeclaredField( fieldName ) ;
    2.23              Class fieldCl = fld.getType();
    2.24 @@ -2564,9 +2563,15 @@
    2.25              long key = bridge.objectFieldOffset( fld ) ;
    2.26              bridge.putObject( o, key, v ) ;
    2.27          } catch (Exception e) {
    2.28 -            throw utilWrapper.errorSetObjectField( e, fieldName,
    2.29 -                o.toString(),
    2.30 -                v.toString() ) ;
    2.31 +            if (o != null) {
    2.32 +                throw utilWrapper.errorSetObjectField( e, fieldName,
    2.33 +                    o.toString(),
    2.34 +                    v.toString() ) ;
    2.35 +            } else {
    2.36 +                throw utilWrapper.errorSetObjectField( e, fieldName,
    2.37 +                    "null " + c.getName() + " object",
    2.38 +                    v.toString() ) ;
    2.39 +            }
    2.40          }
    2.41      }
    2.42  
    2.43 @@ -2574,12 +2579,22 @@
    2.44      {
    2.45          try {
    2.46              Field fld = c.getDeclaredField( fieldName ) ;
    2.47 -            long key = bridge.objectFieldOffset( fld ) ;
    2.48 -            bridge.putBoolean( o, key, v ) ;
    2.49 +            if ((fld != null) && (fld.getType() == Boolean.TYPE)) {
    2.50 +                long key = bridge.objectFieldOffset( fld ) ;
    2.51 +                bridge.putBoolean( o, key, v ) ;
    2.52 +            } else {
    2.53 +                throw new InvalidObjectException("Field Type mismatch");
    2.54 +            }
    2.55          } catch (Exception e) {
    2.56 +            if (o != null) {
    2.57              throw utilWrapper.errorSetBooleanField( e, fieldName,
    2.58                  o.toString(),
    2.59                  new Boolean(v) ) ;
    2.60 +            } else {
    2.61 +                throw utilWrapper.errorSetBooleanField( e, fieldName,
    2.62 +                    "null " + c.getName() + " object",
    2.63 +                    new Boolean(v) ) ;
    2.64 +            }
    2.65          }
    2.66      }
    2.67  
    2.68 @@ -2587,12 +2602,22 @@
    2.69      {
    2.70          try {
    2.71              Field fld = c.getDeclaredField( fieldName ) ;
    2.72 -            long key = bridge.objectFieldOffset( fld ) ;
    2.73 -            bridge.putByte( o, key, v ) ;
    2.74 +            if ((fld != null) && (fld.getType() == Byte.TYPE)) {
    2.75 +                long key = bridge.objectFieldOffset( fld ) ;
    2.76 +                bridge.putByte( o, key, v ) ;
    2.77 +            } else {
    2.78 +                throw new InvalidObjectException("Field Type mismatch");
    2.79 +            }
    2.80          } catch (Exception e) {
    2.81 -            throw utilWrapper.errorSetByteField( e, fieldName,
    2.82 -                o.toString(),
    2.83 -                new Byte(v) ) ;
    2.84 +            if (o != null) {
    2.85 +                throw utilWrapper.errorSetByteField( e, fieldName,
    2.86 +                    o.toString(),
    2.87 +                    new Byte(v) ) ;
    2.88 +            } else {
    2.89 +                throw utilWrapper.errorSetByteField( e, fieldName,
    2.90 +                    "null " + c.getName() + " object",
    2.91 +                    new Byte(v) ) ;
    2.92 +            }
    2.93          }
    2.94      }
    2.95  
    2.96 @@ -2600,12 +2625,22 @@
    2.97      {
    2.98          try {
    2.99              Field fld = c.getDeclaredField( fieldName ) ;
   2.100 -            long key = bridge.objectFieldOffset( fld ) ;
   2.101 -            bridge.putChar( o, key, v ) ;
   2.102 +            if ((fld != null) && (fld.getType() == Character.TYPE)) {
   2.103 +                long key = bridge.objectFieldOffset( fld ) ;
   2.104 +                bridge.putChar( o, key, v ) ;
   2.105 +            } else {
   2.106 +                throw new InvalidObjectException("Field Type mismatch");
   2.107 +            }
   2.108          } catch (Exception e) {
   2.109 -            throw utilWrapper.errorSetCharField( e, fieldName,
   2.110 -                o.toString(),
   2.111 -                new Character(v) ) ;
   2.112 +            if (o != null) {
   2.113 +                throw utilWrapper.errorSetCharField( e, fieldName,
   2.114 +                    o.toString(),
   2.115 +                    new Character(v) ) ;
   2.116 +            } else {
   2.117 +                throw utilWrapper.errorSetCharField( e, fieldName,
   2.118 +                    "null " + c.getName() + " object",
   2.119 +                    new Character(v) ) ;
   2.120 +            }
   2.121          }
   2.122      }
   2.123  
   2.124 @@ -2613,12 +2648,22 @@
   2.125      {
   2.126          try {
   2.127              Field fld = c.getDeclaredField( fieldName ) ;
   2.128 -            long key = bridge.objectFieldOffset( fld ) ;
   2.129 -            bridge.putShort( o, key, v ) ;
   2.130 +            if ((fld != null) && (fld.getType() == Short.TYPE)) {
   2.131 +                long key = bridge.objectFieldOffset( fld ) ;
   2.132 +                bridge.putShort( o, key, v ) ;
   2.133 +            } else {
   2.134 +                throw new InvalidObjectException("Field Type mismatch");
   2.135 +            }
   2.136          } catch (Exception e) {
   2.137 +            if (o != null) {
   2.138              throw utilWrapper.errorSetShortField( e, fieldName,
   2.139                  o.toString(),
   2.140                  new Short(v) ) ;
   2.141 +            } else {
   2.142 +                throw utilWrapper.errorSetShortField( e, fieldName,
   2.143 +                    "null " + c.getName() + " object",
   2.144 +                    new Short(v) ) ;
   2.145 +            }
   2.146          }
   2.147      }
   2.148  
   2.149 @@ -2626,12 +2671,22 @@
   2.150      {
   2.151          try {
   2.152              Field fld = c.getDeclaredField( fieldName ) ;
   2.153 -            long key = bridge.objectFieldOffset( fld ) ;
   2.154 -            bridge.putInt( o, key, v ) ;
   2.155 +            if ((fld != null) && (fld.getType() == Integer.TYPE)) {
   2.156 +                long key = bridge.objectFieldOffset( fld ) ;
   2.157 +                bridge.putInt( o, key, v ) ;
   2.158 +            } else {
   2.159 +                throw new InvalidObjectException("Field Type mismatch");
   2.160 +            }
   2.161          } catch (Exception e) {
   2.162 -            throw utilWrapper.errorSetIntField( e, fieldName,
   2.163 -                o.toString(),
   2.164 -                new Integer(v) ) ;
   2.165 +            if (o != null) {
   2.166 +                throw utilWrapper.errorSetIntField( e, fieldName,
   2.167 +                    o.toString(),
   2.168 +                    new Integer(v) ) ;
   2.169 +            } else {
   2.170 +                throw utilWrapper.errorSetIntField( e, fieldName,
   2.171 +                    "null " + c.getName() + " object",
   2.172 +                    new Integer(v) ) ;
   2.173 +            }
   2.174          }
   2.175      }
   2.176  
   2.177 @@ -2639,12 +2694,22 @@
   2.178      {
   2.179          try {
   2.180              Field fld = c.getDeclaredField( fieldName ) ;
   2.181 -            long key = bridge.objectFieldOffset( fld ) ;
   2.182 -            bridge.putLong( o, key, v ) ;
   2.183 +            if ((fld != null) && (fld.getType() == Long.TYPE)) {
   2.184 +                long key = bridge.objectFieldOffset( fld ) ;
   2.185 +                bridge.putLong( o, key, v ) ;
   2.186 +            } else {
   2.187 +                throw new InvalidObjectException("Field Type mismatch");
   2.188 +            }
   2.189          } catch (Exception e) {
   2.190 -            throw utilWrapper.errorSetLongField( e, fieldName,
   2.191 -                o.toString(),
   2.192 -                new Long(v) ) ;
   2.193 +            if (o != null) {
   2.194 +                throw utilWrapper.errorSetLongField( e, fieldName,
   2.195 +                    o.toString(),
   2.196 +                    new Long(v) ) ;
   2.197 +            } else {
   2.198 +                throw utilWrapper.errorSetLongField( e, fieldName,
   2.199 +                    "null " + c.getName() + " object",
   2.200 +                    new Long(v) ) ;
   2.201 +            }
   2.202          }
   2.203      }
   2.204  
   2.205 @@ -2652,12 +2717,22 @@
   2.206      {
   2.207          try {
   2.208              Field fld = c.getDeclaredField( fieldName ) ;
   2.209 -            long key = bridge.objectFieldOffset( fld ) ;
   2.210 -            bridge.putFloat( o, key, v ) ;
   2.211 +            if ((fld != null) && (fld.getType() == Float.TYPE)) {
   2.212 +                long key = bridge.objectFieldOffset( fld ) ;
   2.213 +                bridge.putFloat( o, key, v ) ;
   2.214 +            } else {
   2.215 +                throw new InvalidObjectException("Field Type mismatch");
   2.216 +            }
   2.217          } catch (Exception e) {
   2.218 -            throw utilWrapper.errorSetFloatField( e, fieldName,
   2.219 -                o.toString(),
   2.220 -                new Float(v) ) ;
   2.221 +            if (o != null) {
   2.222 +                throw utilWrapper.errorSetFloatField( e, fieldName,
   2.223 +                    o.toString(),
   2.224 +                    new Float(v) ) ;
   2.225 +            } else {
   2.226 +                throw utilWrapper.errorSetFloatField( e, fieldName,
   2.227 +                    "null " + c.getName() + " object",
   2.228 +                    new Float(v) ) ;
   2.229 +            }
   2.230          }
   2.231      }
   2.232  
   2.233 @@ -2665,12 +2740,22 @@
   2.234      {
   2.235          try {
   2.236              Field fld = c.getDeclaredField( fieldName ) ;
   2.237 -            long key = bridge.objectFieldOffset( fld ) ;
   2.238 -            bridge.putDouble( o, key, v ) ;
   2.239 +            if ((fld != null) && (fld.getType() == Double.TYPE)) {
   2.240 +                long key = bridge.objectFieldOffset( fld ) ;
   2.241 +                bridge.putDouble( o, key, v ) ;
   2.242 +            } else {
   2.243 +                throw new InvalidObjectException("Field Type mismatch");
   2.244 +            }
   2.245          } catch (Exception e) {
   2.246 -            throw utilWrapper.errorSetDoubleField( e, fieldName,
   2.247 -                o.toString(),
   2.248 -                new Double(v) ) ;
   2.249 +            if (o != null) {
   2.250 +                throw utilWrapper.errorSetDoubleField( e, fieldName,
   2.251 +                    o.toString(),
   2.252 +                    new Double(v) ) ;
   2.253 +            } else {
   2.254 +                throw utilWrapper.errorSetDoubleField( e, fieldName,
   2.255 +                    "null " + c.getName() + " object",
   2.256 +                    new Double(v) ) ;
   2.257 +            }
   2.258          }
   2.259      }
   2.260