Mercurial > hg > icedtea8-forest > corba

changeset 1375:7ea39ff8c227 icedtea-3.1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3106: Handle both correctly-spelt property "enableCustomValueHandler" introduced by S8079718 and typo version
author andrew
date Mon, 25 Jul 2016 06:40:28 +0100
parents c8d3e3ff760f
children 48dbf4a68dc7
files src/share/classes/javax/rmi/CORBA/Util.java
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/rmi/CORBA/Util.java	Mon Jul 25 06:38:21 2016 +0100
+++ b/src/share/classes/javax/rmi/CORBA/Util.java	Mon Jul 25 06:40:28 2016 +0100
@@ -413,8 +413,18 @@
                 // check that a serialization permission has been
                 // set to allow the loading of the Util delegate
                 // which provides access to custom ValueHandler
-                sm.checkPermission(new SerializablePermission(
-                        "enableCustomValueHanlder"));
+                try {
+                    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
+                    }
+                }
             }
         }
     }