svn commit: r1807491 - in /sling/trunk/bundles/commons/classloader/src: main/java/org/apache/sling/commons/classloader/impl/Activator.java test/java/org/apache/sling/commons/classloader/impl/BundeChangesTest.java

[cziegeler]

Author: cziegeler
Date: Wed Sep  6 14:01:23 2017
New Revision: 1807491

URL: http://svn.apache.org/viewvc?rev=1807491&view=rev
Log:
SLING-7109 : Bundle not marked as used if a resource is loaded from a bundle

Modified:
    
sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/Activator.java
    
sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/BundeChangesTest.java

Modified: 
sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/Activator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/Activator.java?rev=1807491&r1=1807490&r2=1807491&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/Activator.java
 (original)
+++ 
sling/trunk/bundles/commons/classloader/src/main/java/org/apache/sling/commons/classloader/impl/Activator.java
 Wed Sep  6 14:01:23 2017
@@ -122,9 +122,6 @@ public class Activator implements Synchr
                 if ( this.service.hasUnresolvedPackages(event.getBundle()) ) {
                     reload = true;
                     logger.debug("Dynamic Class Loader is reloaded because the 
new bundle '{}' provides previously unresolved packages", event.getBundle());
-                } else if ( 
this.service.isBundleUsed(event.getBundle().getBundleId()) ) {
-                    reload = true;
-                    logger.debug("Dynamic Class Loader is reloaded because the 
bundle '{}' has been updated", event.getBundle());
                 } else {
                     reload = false;
                 }

Modified: 
sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/BundeChangesTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/BundeChangesTest.java?rev=1807491&r1=1807490&r2=1807491&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/BundeChangesTest.java
 (original)
+++ 
sling/trunk/bundles/commons/classloader/src/test/java/org/apache/sling/commons/classloader/impl/BundeChangesTest.java
 Wed Sep  6 14:01:23 2017
@@ -127,7 +127,7 @@ public class BundeChangesTest {
         assertFalse(registerCalled.get());
         assertFalse(unregisterCalled.get());
         listener.bundleChanged(new BundleEvent(BundleEvent.STARTED, bundle));
-        assertTrue(registerCalled.get());
-        assertTrue(unregisterCalled.get());
+        assertFalse(registerCalled.get());
+        assertFalse(unregisterCalled.get());
     }
 }