You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by fm...@apache.org on 2011/11/16 13:13:40 UTC

svn commit: r1202654 - /felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java

Author: fmeschbe
Date: Wed Nov 16 12:13:39 2011
New Revision: 1202654

URL: http://svn.apache.org/viewvc?rev=1202654&view=rev
Log:
FELIX-3230 Properly check permission of configuration location (CP("*",CONFIGURE) in case of null location)

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

Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java?rev=1202654&r1=1202653&r2=1202654&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java Wed Nov 16 12:13:39 2011
@@ -92,7 +92,8 @@ public class ConfigurationAdapter implem
                 { 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 );