felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1202608 - /felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
Date Wed, 16 Nov 2011 09:51:24 GMT
Author: fmeschbe
Date: Wed Nov 16 09:51:23 2011
New Revision: 1202608

URL: http://svn.apache.org/viewvc?rev=1202608&view=rev
Log:
FELIX-3228 Properly check for CP("*", CONFIGURE) in case the current location is null

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=1202608&r1=1202607&r2=1202608&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 09:51:23 2011
@@ -74,9 +74,10 @@ public class ConfigurationAdapter implem
         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;
     }
 
 



Mime
View raw message