svn commit: r894169 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java

[cziegeler]

Author: cziegeler
Date: Mon Dec 28 13:30:45 2009
New Revision: 894169

URL: http://svn.apache.org/viewvc?rev=894169&view=rev
Log:
FELIX-1961 : NPE when invoking install/update panel

Modified:
    
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java

Modified: 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java?rev=894169&r1=894168&r2=894169&view=diff
==============================================================================
--- 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
 (original)
+++ 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
 Mon Dec 28 13:30:45 2009
@@ -384,7 +384,7 @@
         pw.println( "var imgRoot = '" + appRoot + "/res/imgs';");
         pw.println( "var startLevel = " + 
getStartLevel().getInitialBundleStartLevel() + ";");
         pw.println( "var drawDetails = " + reqInfo.bundleRequested + ";");
-        pw.println( "var currentBundle = " + (reqInfo.bundleRequested ? 
String.valueOf(reqInfo.bundle.getBundleId()) : "null") + ";");
+        pw.println( "var currentBundle = " + (reqInfo.bundleRequested && 
reqInfo.bundle != null ? String.valueOf(reqInfo.bundle.getBundleId()) : "null") 
+ ";");
         Util.endScript( pw );
 
         Util.script(pw, appRoot, "bundles.js");