merged Chris's address fixes

eucalyptus · Feb 27, 2010 · 5894300 · 5894300
2 parents 5b56770 + e8219f2
commit 5894300
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/address/Address.java
@@ -218,6 +218,7 @@ public void init( ) {//Should only EVER be called externally after loading from
         this.instanceAddress = UNASSIGNED_INSTANCEADDR;
         this.instanceId = UNASSIGNED_INSTANCEID;
         Address.removeAddress( this.name );
+        this.state.set( State.unallocated, false );
       } else {
         Addresses.getInstance( ).register( this );
         this.state.set( State.allocated, false );        

diff --git a/...er-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/UnassignAddressCallback.groovy b/...er-manager/src/main/java/edu/ucsb/eucalyptus/cloud/cluster/UnassignAddressCallback.groovy
@@ -134,7 +134,7 @@ public class UnassignAddressCallback extends QueuedEventCallback<UnassignAddress
         try { this.address.release(); } catch( Throwable t ) {
           LOG.warn( "Failed to release orphan address: " + this.address );
         }
-      }
+      } 
     }
   }