/hg/release/icedtea-web-1.3: Fir regression that sometimes resul...

[dbhole at icedtea.classpath.org]

changeset a63733958565 in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=a63733958565
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Aug 27 15:32:08 2012 -0400

	Fir regression that sometimes results in ClassCircularityError


diffstat:

 ChangeLog                                              |  6 ++++++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (25 lines):

diff -r a33517a5a85d -r a63733958565 ChangeLog
--- 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 at 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 at redhat.com>
 
 	* tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
diff -r a33517a5a85d -r a63733958565 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.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