felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1776415 - in /felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl: ConfigurationAdapter.java ConfigurationAdminImpl.java ConfigurationManager.java
Date Thu, 29 Dec 2016 12:44:02 GMT
Author: cziegeler
Date: Thu Dec 29 12:44:02 2016
New Revision: 1776415

URL: http://svn.apache.org/viewvc?rev=1776415&view=rev
Log:
FELIX-5290 : [R7] Locking Configuration Records

Modified:
    felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
    felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
    felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.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=1776415&r1=1776414&r2=1776415&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
Thu Dec 29 12:44:02 2016
@@ -217,7 +217,7 @@ public class ConfigurationAdapter implem
         this.configurationAdmin.checkPermission(this.delegatee.getConfigurationManager(),
                 ( bundleLocation == null ) ? "*" : bundleLocation,
                         ConfigurationPermission.ATTRIBUTE,
-                        true);
+                        false);
 
         Log.logger.log( LogService.LOG_DEBUG, "addAttributes({0})", attrs );
 
@@ -262,7 +262,7 @@ public class ConfigurationAdapter implem
         this.configurationAdmin.checkPermission(this.delegatee.getConfigurationManager(),
                 ( bundleLocation == null ) ? "*" : bundleLocation,
                         ConfigurationPermission.ATTRIBUTE,
-                        true);
+                        false);
 
         Log.logger.log( LogService.LOG_DEBUG, "removeAttributes({0})", attrs );
 

Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java?rev=1776415&r1=1776414&r2=1776415&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
(original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationAdminImpl.java
Thu Dec 29 12:44:02 2016
@@ -236,7 +236,7 @@ public class ConfigurationAdminImpl impl
      *
      * @param name The bundle location to check for permission. If this
      *      is <code>null</code> permission is always granted.
-     * @param checkOwn If {@code false} permission is alwas granted if
+     * @param checkOwn If {@code false} permission is always granted if
      *      {@code name} is the same the using bundle's location.
      *
      * @throws SecurityException if the access control context does not
@@ -255,8 +255,8 @@ public class ConfigurationAdminImpl impl
      * @param name The bundle location to check for permission. If this
      *      is <code>null</code> permission is always granted.
      * @param action The action to check.
-     * @param checkOwn If {@code false} permission is alwas granted if
-     *      {@code name} is the same the using bundle's location.
+     * @param checkOwn If {@code false} permission is always granted if
+     *      {@code name} is the same as the using bundle's location.
      *
      * @throws SecurityException if the access control context does not
      *      have the appropriate permission

Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java?rev=1776415&r1=1776414&r2=1776415&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
(original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Thu Dec 29 12:44:02 2016
@@ -474,7 +474,7 @@ public class ConfigurationManager implem
      *
      * @param pid The PID for which to return the configuration
      * @return The configuration or <code>null</code> if non exists
-     * @throws IOException If an error occurrs reading from a persistence
+     * @throws IOException If an error occurs reading from a persistence
      *      manager.
      */
     ConfigurationImpl getConfiguration( String pid ) throws IOException



Mime
View raw message