Skip to content
Browse files

fix to restoring address mappings

  • Loading branch information...
1 parent 3127064 commit 9951938a835f6b3e6f48509ba918ad77d463e9bc @grze grze committed Feb 1, 2012
View
6 ...es/cluster-manager/src/main/java/com/eucalyptus/address/AbstractSystemAddressManager.java
@@ -285,13 +285,15 @@ private static VmInstance maybeFindVm( final String instanceId, final String pub
Logs.extreme( ).error( ex );
}
}
- if ( vm != null && VmState.RUNNING.equals( vm ) ) {
+ if ( vm != null && VmState.RUNNING.equals( vm.getState( ) ) ) {
Logs.extreme( ).debug( "Candidate vm which claims this address: " + vm.getInstanceId( ) + " " + vm.getState( ) + " " + publicIp );
if ( publicIp.equals( vm.getPublicAddress( ) ) ) {
Logs.extreme( ).debug( "Found vm which claims this address: " + vm.getInstanceId( ) + " " + vm.getState( ) + " " + publicIp );
}
+ return vm;
+ } else {
+ return null;
}
- return vm;
}
private static void ensureAllocated( final Address addr, final VmInstance vm ) {

0 comments on commit 9951938

Please sign in to comment.
Something went wrong with that request. Please try again.