You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/08/23 18:03:53 UTC

svn commit: r1376565 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RestartActiveBundlesTask.java

Author: cziegeler
Date: Thu Aug 23 16:03:52 2012
New Revision: 1376565

URL: http://svn.apache.org/viewvc?rev=1376565&view=rev
Log:
Prevent NPE in log statement

Modified:
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RestartActiveBundlesTask.java

Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RestartActiveBundlesTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RestartActiveBundlesTask.java?rev=1376565&r1=1376564&r2=1376565&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RestartActiveBundlesTask.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RestartActiveBundlesTask.java Thu Aug 23 16:03:52 2012
@@ -80,7 +80,8 @@ public class RestartActiveBundlesTask ex
                         getLogger().info("Unable to start bundle {} : {}", bundle, e.getMessage());
                     }
                 } else {
-                    getLogger().debug("Bundle does not need restart: {} (state {})", bundle, bundle.getState());
+                    // bundle might be null(!)
+                    getLogger().debug("Bundle does not need restart: {} (state {})", bundle, (bundle == null ? "uninstalled" : bundle.getState()));
                     remove.add(id);
                 }
             }