changeset in /hg/icedtea: 2009-06-16 Omair Majid <omajid at redha...

[Omair Majid]

changeset 5153060e463b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5153060e463b
description:
	2009-06-16  Omair Majid  <omajid at redhat.com>

	    * netx/net/sourceforge/jnlp/services/ServiceUtil.java:
	    (invoke): Throw the original exception that caused the problem.

diffstat:

2 files changed, 24 insertions(+), 6 deletions(-)
ChangeLog                                           |    5 +++
netx/net/sourceforge/jnlp/services/ServiceUtil.java |   25 ++++++++++++++-----

diffs (47 lines):

diff -r a5edccad3c7c -r 5153060e463b ChangeLog
--- a/ChangeLog	Wed Jun 10 12:00:53 2009 -0400
+++ b/ChangeLog	Tue Jun 16 10:23:45 2009 -0400
@@ -1,3 +1,8 @@ 2009-06-10  Omair Majid  <omajid at redhat.
+2009-06-16  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/services/ServiceUtil.java:
+	(invoke): Throw the original exception that caused the problem.
+
 2009-06-10  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/JNLPFile.java
diff -r a5edccad3c7c -r 5153060e463b netx/net/sourceforge/jnlp/services/ServiceUtil.java
--- a/netx/net/sourceforge/jnlp/services/ServiceUtil.java	Wed Jun 10 12:00:53 2009 -0400
+++ b/netx/net/sourceforge/jnlp/services/ServiceUtil.java	Tue Jun 16 10:23:45 2009 -0400
@@ -159,12 +159,25 @@ public class ServiceUtil {
                 }
             };
 
-            Object result = AccessController.doPrivileged(invoker);
-
-            if (JNLPRuntime.isDebug())
-                System.err.println("        result: "+result);
-
-            return result;
+            try {
+                Object result = AccessController.doPrivileged(invoker);
+
+                if (JNLPRuntime.isDebug())
+                    System.err.println("        result: "+result);
+
+                return result;
+            } catch (PrivilegedActionException e) {
+                // Any exceptions thrown by the actual methods are wrapped by a 
+                // InvocationTargetException, which is further wrapped by the 
+                // PrivilegedActionException. Lets unwrap them to make the 
+                // proxy transparent to the callers
+                if (e.getCause() instanceof InvocationTargetException) {
+                    throw e.getCause().getCause();
+                } else {
+                    throw e.getCause();
+                }
+            }
+
         }
     };