commit 565151a56d62190293a4e1511782e4cbfd03ee4a
author Felix Meschberger <fmeschbe@apache.org> Wed Nov 16 12:13:39 2011 +0000
committer Felix Meschberger <fmeschbe@apache.org> Wed Nov 16 12:13:39 2011 +0000
tree 211318d1f884a03c79937eb39ea77c1b9266f4a8
parent 55d0a82b5d0303a90554bff40bbd3ae63c69ac34

FELIX-3230 Properly check permission of configuration location (CP("*",CONFIGURE) in case of null location)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1202654 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 6ba1ca1..2915906 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
@@ -92,7 +92,8 @@
                 { bundleLocation } );
 
         // CM 1.4 / 104.13.2.4
-        configurationAdmin.checkPermission( delegatee.getBundleLocation() );
+        final String configLocation = delegatee.getBundleLocation();
+        configurationAdmin.checkPermission( ( configLocation == null ) ? "*" : configLocation );
         configurationAdmin.checkPermission( ( bundleLocation == null ) ? "*" : bundleLocation );
         checkDeleted();
         delegatee.setStaticBundleLocation( bundleLocation );