You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by aw...@apache.org on 2010/01/18 21:09:13 UTC

svn commit: r900529 - in /incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx: framework/Framework.java permissionadmin/PermissionAdmin.java

Author: awojtuniak
Date: Mon Jan 18 20:09:13 2010
New Revision: 900529

URL: http://svn.apache.org/viewvc?rev=900529&view=rev
Log:
Fixing couple issues in the code

Modified:
    incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java
    incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/permissionadmin/PermissionAdmin.java

Modified: incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java?rev=900529&r1=900528&r2=900529&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java (original)
+++ incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/Framework.java Mon Jan 18 20:09:13 2010
@@ -142,7 +142,7 @@
             return new BatchInstallResult("Failed to install bundles arguments can't be null").toCompositeData(); 
         }
         
-        if(locations != null && locations != null && locations.length != urls.length){
+        if(locations != null && locations.length != urls.length){
             return new BatchInstallResult("Failed to install bundles size of arguments should be same").toCompositeData(); 
         }
         long[] ids = new long[locations.length];

Modified: incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/permissionadmin/PermissionAdmin.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/permissionadmin/PermissionAdmin.java?rev=900529&r1=900528&r2=900529&view=diff
==============================================================================
--- incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/permissionadmin/PermissionAdmin.java (original)
+++ incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/permissionadmin/PermissionAdmin.java Mon Jan 18 20:09:13 2010
@@ -91,6 +91,7 @@
         if(encodedPermissions == null){
             //default permissions are to be removed
             permAdmin.setDefaultPermissions(null);
+            return;
         }
         PermissionInfo[] permissions = new PermissionInfo[encodedPermissions.length];
         for (int i = 0; i < encodedPermissions.length; i++) {
@@ -108,6 +109,7 @@
         if(encodedPermissions == null){
             //default permissions are to be removed
             permAdmin.setPermissions(location, null);
+            return;
         }
         PermissionInfo[] permissions = new PermissionInfo[encodedPermissions.length];
         for (int i = 0; i < encodedPermissions.length; i++) {