Merge a fix for a bug in VmInstances.java in if condition when checki…

…ng the VM permission.
eucalyptus · Feb 12, 2010 · 15b426e · 15b426e
1 parent c32917a
commit 15b426e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstances.java b/clc/modules/cluster-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/VmInstances.java
@@ -136,7 +136,7 @@ public VmInstance lookupByPublicIp ( String ip ) throws NoSuchElementException {
 
   public static VmInstance restrictedLookup( String userId, boolean administrator, String instanceId ) throws EucalyptusCloudException {
     VmInstance vm = VmInstances.getInstance( ).lookup( instanceId ); //TODO: test should throw error.
-    if ( !administrator || !vm.getOwnerId( ).equals( userId ) ) {
+    if ( !administrator && !vm.getOwnerId( ).equals( userId ) ) {
       throw new EucalyptusCloudException( "Permission denied while trying to lookup vm instance: " + instanceId );
     }
     return vm;