You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/08/17 10:37:41 UTC
svn commit: r1696216 - in /felix/trunk/webconsole-plugins/ds: changelog.txt
src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java
Author: cziegeler
Date: Mon Aug 17 08:37:41 2015
New Revision: 1696216
URL: http://svn.apache.org/r1696216
Log:
FELIX-5005 : BundleInfoProvider should work with null being passed as appRoot
Modified:
felix/trunk/webconsole-plugins/ds/changelog.txt
felix/trunk/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java
Modified: felix/trunk/webconsole-plugins/ds/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/ds/changelog.txt?rev=1696216&r1=1696215&r2=1696216&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/ds/changelog.txt (original)
+++ felix/trunk/webconsole-plugins/ds/changelog.txt Mon Aug 17 08:37:41 2015
@@ -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
---------------------------
Modified: felix/trunk/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java?rev=1696216&r1=1696215&r2=1696216&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java (original)
+++ felix/trunk/webconsole-plugins/ds/src/main/java/org/apache/felix/webconsole/plugins/ds/internal/InfoProvider.java Mon Aug 17 08:37:41 2015
@@ -105,7 +105,7 @@ class InfoProvider implements BundleInfo
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);
}