svn commit: r1523603 - /sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/ClassLoaderFacade.java

[cz...@apache.org]

Author: cziegeler
Date: Mon Sep 16 11:54:54 2013
New Revision: 1523603

URL: http://svn.apache.org/r1523603
Log:
SLING-3071 : DynamicClassLoaderManager should return DynamicClassLoaders. Apply patch from Francesco Mari.

Modified:
    sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/ClassLoaderFacade.java

Modified: sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/ClassLoaderFacade.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/ClassLoaderFacade.java?rev=1523603&r1=1523602&r2=1523603&view=diff
==============================================================================
--- sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/ClassLoaderFacade.java (original)
+++ sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/ClassLoaderFacade.java Mon Sep 16 11:54:54 2013
@@ -25,6 +25,7 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
+import org.apache.sling.commons.classloader.DynamicClassLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,14 +37,14 @@ import org.slf4j.LoggerFactory;
  * This class loader delegates to other class loaders
  * but caches its result for performance.
  */
-public class ClassLoaderFacade extends ClassLoader {
+public class ClassLoaderFacade extends ClassLoader implements DynamicClassLoader {
 
     /** The logger. */
     private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
     /** Dynamic class loader manager which manages the dynamic class loader providers for this facade. */
     private final DynamicClassLoaderManagerImpl manager;
-    
+
     /** Used to log stack traces in slf4j for non-critical errors */
     @SuppressWarnings("serial")
     static class StackTraceProbe extends Exception {
@@ -60,11 +61,11 @@ public class ClassLoaderFacade extends C
     }
 
     /** Return false if our manager is not active, and log the stack trace
-     *  when that happens, to ease troubleshooting. 
+     *  when that happens, to ease troubleshooting.
      */
     private boolean checkManagerActive() {
         if(!this.manager.isActive()) {
-            final String msg = "Dynamic class loader has already been deactivated."; 
+            final String msg = "Dynamic class loader has already been deactivated.";
             final StackTraceProbe p = new StackTraceProbe(msg);
             logger.error(msg, p);
             return false;
@@ -75,6 +76,7 @@ public class ClassLoaderFacade extends C
     /**
      * @see java.lang.ClassLoader#getResource(java.lang.String)
      */
+    @Override
     public URL getResource(String name) {
         if (!checkManagerActive()) {
             return null;
@@ -100,6 +102,7 @@ public class ClassLoaderFacade extends C
     /**
      * @see java.lang.ClassLoader#getResources(java.lang.String)
      */
+    @Override
     public Enumeration<URL> getResources(String name) throws IOException {
         if(!checkManagerActive()) {
             return Collections.enumeration(EMPTY_LIST);
@@ -124,6 +127,7 @@ public class ClassLoaderFacade extends C
     /**
      * @see java.lang.ClassLoader#loadClass(java.lang.String, boolean)
      */
+    @Override
     protected synchronized Class<?> loadClass(String name, boolean resolve)
     throws ClassNotFoundException {
         if(!checkManagerActive()) {
@@ -144,4 +148,11 @@ public class ClassLoaderFacade extends C
         }
         throw new ClassNotFoundException(name);
     }
+
+    /**
+     * @see org.apache.sling.commons.classloader.DynamicClassLoader#isLive()
+     */
+    public boolean isLive() {
+        return this.manager.isActive();
+    }
 }