commit abca58df6ccb3d8c4e637fc15dff0ebccc9ec54a
author Felix Meschberger <fmeschbe@apache.org> Wed Nov 16 09:51:23 2011 +0000
committer Felix Meschberger <fmeschbe@apache.org> Wed Nov 16 09:51:23 2011 +0000
tree 007f692820e4ebfe3622f33b2cba39bc59885c89
parent d157c4bb23d3d5aa5b9406f205b73bfc219b5930

FELIX-3228 Properly check for CP("*", CONFIGURE) in case the current location is null

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

configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java

diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
index f005194..6ba1ca1 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
@@ -74,9 +74,10 @@
         delegatee.getConfigurationManager().log( LogService.LOG_DEBUG, "getBundleLocation()", ( Throwable ) null );
 
         // CM 1.4 / 104.13.2.4
-        configurationAdmin.checkPermission( delegatee.getBundleLocation() );
+        final String bundleLocation = delegatee.getBundleLocation();
+        configurationAdmin.checkPermission( ( bundleLocation == null ) ? "*" : bundleLocation );
         checkDeleted();
-        return delegatee.getBundleLocation();
+        return bundleLocation;
     }