[jboss-remoting-commits] JBoss Remoting SVN: r3844 - remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2008-04-02 00:11:26 -0400 (Wed, 02 Apr 2008)
New Revision: 3844

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/MarshalledValueInputStream.java
Log:
JBREM-934: Put Thread().getContextClassLoader() call in AccessController.doPrivileged() call.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/MarshalledValueInputStream.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/MarshalledValueInputStream.java	2008-04-02 04:10:43 UTC (rev 3843)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/java/MarshalledValueInputStream.java	2008-04-02 04:11:26 UTC (rev 3844)
@@ -28,6 +28,9 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.lang.reflect.Proxy;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
 import org.jboss.logging.Logger;
 
 /**
@@ -67,7 +70,13 @@
 
       if(resolvedClass == null)
       {
-         ClassLoader loader = Thread.currentThread().getContextClassLoader();
+         ClassLoader loader = (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
+         {
+            public Object run()
+            {
+               return Thread.currentThread().getContextClassLoader();
+            }
+         });
          try
          {
             resolvedClass = Class.forName(className, false, loader);
@@ -116,7 +125,13 @@
          {
             if(loader == null)
             {
-               loader = Thread.currentThread().getContextClassLoader();
+               loader = (ClassLoader) AccessController.doPrivileged( new PrivilegedAction()
+               {
+                  public Object run()
+                  {
+                     return Thread.currentThread().getContextClassLoader();
+                  }
+               });
             }
             iface = Class.forName(className, false, loader);
          }