FELIX-5005 : BundleInfoProvider should work with null being passed as appRoot
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1696216 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/ds/changelog.txt b/webconsole-plugins/ds/changelog.txt
index 3b883df..d007bd8 100755
--- a/webconsole-plugins/ds/changelog.txt
+++ b/webconsole-plugins/ds/changelog.txt
@@ -1,3 +1,11 @@
+Changes from 2.0.0 to 2.0.2
+---------------------------
+** Improvement
+ * [FELIX-4998] - Declarative Service plugin might provide JSON format support for Inventory Printer
+** Bug
+ * [FELIX-5005] - BundleInfoProvider should work with null being passed as appRoot
+
+
Changes from 1.0.0 to 2.0.0
---------------------------
diff --git a/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java b/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java
index 0103662..5744430 100644
--- a/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java
+++ b/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java
@@ -105,7 +105,7 @@
name != null ? name : "", //$NON-NLS-1$
state, //
});
- return new BundleInfo(key, webConsoleRoot + "/components/" + cfg.id, //$NON-NLS-1$
+ return new BundleInfo(key, (webConsoleRoot == null ? "" : webConsoleRoot) + "/components/" + cfg.id, //$NON-NLS-1$
BundleInfoType.LINK, descr);
}