Mercurial > hg > icedtea8-forest > corba

changeset 1446:9d3757e6da35 icedtea-3.2.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u111-b14
author andrew
date Thu, 03 Nov 2016 18:13:03 +0000
parents 39af614e6db0 (current diff) 7898951ff63c (diff)
children c4ec5b18cec9
files .hgtags src/share/classes/javax/rmi/CORBA/Util.java
diffstat 2 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Nov 03 02:53:21 2016 +0000
+++ b/.hgtags	Thu Nov 03 18:13:03 2016 +0000
@@ -612,6 +612,9 @@
 8f0466c0dce60b1df3bc01785b01a7f09fa7b564 jdk8u92-b13
 5617f9bec354fb2c60bbb816d175f4cee7d2c56e jdk8u92-b14
 fe88377e18b0c5f3da8e6741e0d5b9bfd45d2648 jdk8u92-b31
+11e4e7e901bc86d14163afbc5d28345e36737344 jdk8u92-b32
+9ed665d319590e0b9997b3703314c6b0341d4362 jdk8u92-b33
+5b5f76caf6e4ffa51f25e64d0d79a3f0913c633e jdk8u92-b34
 073b951904b3ee7c54fb79a169478fa66d925320 jdk8u75-b00
 5b48f7defe40eab668fe554df0afd87d84d60722 jdk8u75-b01
 0015f4a7f0d02a9bb79b7a0c737590f01feaabd4 jdk8u75-b02
@@ -683,3 +686,19 @@
 a7c292080d5ed76ea5e3b123c0dee4c340aa174f jdk8u102-b13
 f85c4b0c0469a20118675c7eb210d1dee05576d8 icedtea-3.2.0pre02
 459f130b3f85a53d487f9d02b5d379a9eaaab400 icedtea-3.2.0pre03
+56b133772ec1aa4f44f2eee2c4103c645f764935 jdk8u102-b14
+8ba5a41487af9fe72aeb92e790327d12dce0de8c jdk8u102-b31
+52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u111-b00
+d123c31c3bc21ccf02ac7368f5476dd9975e15e3 jdk8u111-b01
+981c4d9dab16b3fa7333e5baa5497c299acd5172 jdk8u111-b02
+893adc105044c14abfb54de32a79f2f21981cafa jdk8u111-b03
+ec7b9aafd7e1e9763925e8b794834612bbe0e19b jdk8u111-b04
+3a25f8a752524bad7e78800158c485b890be3982 jdk8u111-b05
+d5dabec41733e59f00dd456f88fb00b3803bed8b jdk8u111-b06
+d8a1e50ce110d18b3ad01ee5c997425bfe90b2a1 jdk8u111-b07
+560812b6d1948df7794f22840e4e3976258b034e jdk8u111-b08
+dbbb2551c63687d9c4a2bb38c42864503cf06465 jdk8u111-b09
+36ccdd95d018368c8a1d70fd40cc8ca3a2c0590f jdk8u111-b10
+dad7b1a59da60d68ff26bf7414b87995fecaaba6 jdk8u111-b11
+a42cdfaa1218a636d2cd0b89a233362cdf32dd4b jdk8u111-b12
+2214875a44e52789acf404b56543f613516ee498 jdk8u111-b13
--- a/src/share/classes/javax/rmi/CORBA/Util.java	Thu Nov 03 02:53:21 2016 +0000
+++ b/src/share/classes/javax/rmi/CORBA/Util.java	Thu Nov 03 18:13:03 2016 +0000
@@ -413,18 +413,8 @@
                 // check that a serialization permission has been
                 // set to allow the loading of the Util delegate
                 // which provides access to custom ValueHandler
-                try {
-                    sm.checkPermission(new SerializablePermission(
+                sm.checkPermission(new SerializablePermission(
                         "enableCustomValueHandler"));
-                } catch (SecurityException ex1) {
-                    // Fallback: See if the permission is mis-spelt
-                    try {
-                        sm.checkPermission(new SerializablePermission(
-                            "enableCustomValueHanlder"));
-                    } catch (SecurityException ex2) {
-                        throw ex1; // Throw original exception
-                    }
-                }
             }
         }
     }