commit 5985aa4527395eb8da24e698dc7e0c09596ce317
author Carsten Ziegeler <cziegeler@apache.org> Mon Dec 28 13:30:45 2009 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Mon Dec 28 13:30:45 2009 +0000
tree bceac8fd7aa1cc49e509b2c62c18f4149bf1e092
parent 050695608dae9371122dac9e12a61e8c64ea95c4

FELIX-1961 : NPE when invoking install/update panel

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@894169 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
index 0748024..a1b14b8 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
@@ -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");