svn commit: r1703786 - in /felix/trunk/webconsole: changelog.txt pom.xml src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java src/main/java/org/apache/felix/webconsole/internal/core/BundleContextUtil.java

[cziegeler]

Author: cziegeler
Date: Fri Sep 18 09:09:55 2015
New Revision: 1703786

URL: http://svn.apache.org/viewvc?rev=1703786&view=rev
Log:
FELIX-5042 : Get system bundle by location, not number for global bundle list

Modified:
    felix/trunk/webconsole/changelog.txt
    felix/trunk/webconsole/pom.xml
    
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
    
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleContextUtil.java

Modified: felix/trunk/webconsole/changelog.txt
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/changelog.txt?rev=1703786&r1=1703785&r2=1703786&view=diff
==============================================================================
--- felix/trunk/webconsole/changelog.txt (original)
+++ felix/trunk/webconsole/changelog.txt Fri Sep 18 09:09:55 2015
@@ -1,3 +1,9 @@
+Changes from 4.2.12 to 4.2.14
+-----------------------------
+** Bug
+    * [FELIX-5042] - Get system bundle by location, not number for global 
bundle list
+
+
 Changes from 4.2.10 to 4.2.12
 -----------------------------
 ** Bug

Modified: felix/trunk/webconsole/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=1703786&r1=1703785&r2=1703786&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Fri Sep 18 09:09:55 2015
@@ -356,7 +356,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.1.0</version>
+            <version>4.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java?rev=1703786&r1=1703785&r2=1703786&view=diff
==============================================================================
--- 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
 (original)
+++ 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
 Fri Sep 18 09:09:55 2015
@@ -496,7 +496,7 @@ class ConfigAdminSupport
         try
         {
             final ServiceReference[] refs = 
getBundleContext().getServiceReferences(
-                null,
+                (String)null,
                 "(&(" + Constants.OBJECTCLASS + '=' + 
ManagedService.class.getName() //$NON-NLS-1$
                     + ")(" + Constants.SERVICE_PID + '=' + pid + "))"); 
//$NON-NLS-1$ //$NON-NLS-2$
             if ( refs != null && refs.length > 0 )

Modified: 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleContextUtil.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleContextUtil.java?rev=1703786&r1=1703785&r2=1703786&view=diff
==============================================================================
--- 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleContextUtil.java
 (original)
+++ 
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundleContextUtil.java
 Fri Sep 18 09:09:55 2015
@@ -18,6 +18,7 @@ package org.apache.felix.webconsole.inte
 
 
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 
 
 /**
@@ -48,7 +49,7 @@ public class BundleContextUtil
     {
         if ( 
WORK_CTX_SYSTEM.equalsIgnoreCase(bc.getProperty(FWK_PROP_WORK_CONTEXT)) )
         {
-            return bc.getBundle(0).getBundleContext();
+            return 
bc.getBundle(Constants.SYSTEM_BUNDLE_LOCATION).getBundleContext();
         }
         return bc;
     }