[jboss-cvs] JBossAS SVN: r103345 - projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins.

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

Author: alesj
Date: 2010-03-31 11:18:26 -0400 (Wed, 31 Mar 2010)
New Revision: 103345

Added:
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/SecurityActions.java
Modified:
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java
Log:
Use pb.

Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java	2010-03-31 15:12:13 UTC (rev 103344)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java	2010-03-31 15:18:26 UTC (rev 103345)
@@ -70,15 +70,14 @@
       ResourceFilter filter = visitor.getFilter();
 
       // something in javassist uses TCL
-      ClassLoader tcl = Thread.currentThread().getContextClassLoader();
-      Thread.currentThread().setContextClassLoader(classLoader);
+      ClassLoader tccl = SecurityActions.setContextClassLoader(classLoader);
       try
       {
          VFSResourceVisitor.visit(roots, excludedRoots, included, excluded, classLoader, visitor, filter, recurseFilter, urls);
       }
       finally
       {
-         Thread.currentThread().setContextClassLoader(tcl);
+         SecurityActions.resetContextClassLoader(tccl);
       }
    }
 

Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java	2010-03-31 15:12:13 UTC (rev 103344)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentUnitScanner.java	2010-03-31 15:18:26 UTC (rev 103345)
@@ -65,15 +65,14 @@
       ResourceFilter filter = visitor.getFilter();
 
       // something in javassist uses TCL
-      ClassLoader tcl = Thread.currentThread().getContextClassLoader();
-      Thread.currentThread().setContextClassLoader(unit.getClassLoader());
+      ClassLoader tccl = SecurityActions.setContextClassLoader(unit.getClassLoader());
       try
       {
          module.visit(visitor, filter, recurseFilter, getRoots());
       }
       finally
       {
-         Thread.currentThread().setContextClassLoader(tcl);
+         SecurityActions.resetContextClassLoader(tccl);
       }
    }
 

Copied: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/SecurityActions.java (from rev 103344, projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DefaultScanner.java)
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/SecurityActions.java	                        (rev 0)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/SecurityActions.java	2010-03-31 15:18:26 UTC (rev 103345)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.scanning.plugins;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * @author ales.justin at jboss.org
+ */
+public class SecurityActions
+{
+   static ClassLoader getContextClassLoader()
+   {
+      if (System.getSecurityManager() == null)
+      {
+         return Thread.currentThread().getContextClassLoader();
+      }
+      else
+      {
+         return AccessController.doPrivileged(GetContextClassLoader.INSTANCE);
+      }
+   }
+
+   static class GetContextClassLoader implements PrivilegedAction<ClassLoader>
+   {
+      static GetContextClassLoader INSTANCE = new GetContextClassLoader();
+
+      public ClassLoader run()
+      {
+         return Thread.currentThread().getContextClassLoader();
+      }
+   }
+
+   static ClassLoader setContextClassLoader(final ClassLoader classLoader)
+   {
+      if (System.getSecurityManager() == null)
+      {
+         ClassLoader previous = Thread.currentThread().getContextClassLoader();
+         Thread.currentThread().setContextClassLoader(classLoader);
+         return previous;
+      }
+      else
+      {
+         return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+         {
+            public ClassLoader run()
+            {
+               ClassLoader previous = Thread.currentThread().getContextClassLoader();
+               Thread.currentThread().setContextClassLoader(classLoader);
+               return previous;
+            }
+         });
+      }
+   }
+
+   static void resetContextClassLoader(final ClassLoader classLoader)
+   {
+      if (System.getSecurityManager() == null)
+      {
+         Thread.currentThread().setContextClassLoader(classLoader);
+      }
+      else
+      {
+         AccessController.doPrivileged(new PrivilegedAction<Object>()
+         {
+            public Object run()
+            {
+               Thread.currentThread().setContextClassLoader(classLoader);
+               return null;
+            }
+         });
+      }
+   }
+}