Mercurial > hg > release > icedtea-web-1.3

changeset 489:a63733958565

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fir regression that sometimes results in ClassCircularityError
author Deepak Bhole <dbhole@redhat.com>
date Mon, 27 Aug 2012 15:32:08 -0400
parents a33517a5a85d
children 2905e24a50bd 03ac5dc76069
files ChangeLog netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 13 15:42:03 2012 +0200
+++ b/ChangeLog	Mon Aug 27 15:32:08 2012 -0400
@@ -1,3 +1,9 @@
+2012-08-27  Deepak Bhole <dbhole@redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(getAccessControlContextForClassLoading): Catch ClassCircularityErrors and
+	ignore them (thus denying permission to caller).
+
 2012-08-13  Jiri Vanek  <jvanek@redhat.com>
 
 	* tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Aug 13 15:42:03 2012 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Aug 27 15:32:08 2012 -0400
@@ -2149,6 +2149,8 @@
             return context; // If context already has all permissions, don't bother
         } catch (AccessControlException ace) {
             // continue below
+        } catch (ClassCircularityError cce) {
+            // continue below
         }
 
         // Since this is for class-loading, technically any class from one jar