Permalink
Browse files

fix rt:5984

  • Loading branch information...
1 parent 397eb16 commit 1f931b7b49e41dc5d2e7df7bc474890b0a7d4a8d @grze grze committed Feb 3, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmControl.java
@@ -438,8 +438,10 @@ public StartInstancesResponseType startInstances( final StartInstancesType reque
try {//scope for allocInfo
AdmissionControl.run( ).apply( allocInfo );
PrivateNetworkIndex vmIdx = allocInfo.getAllocationTokens( ).get( 0 ).getNetworkIndex( );
- vmIdx.set( vm );
- vm.setNetworkIndex( vmIdx );
+ if ( vmIdx != null ) {
+ vmIdx.set( vm );
+ vm.setNetworkIndex( vmIdx );
+ }
vm.setState( VmState.PENDING );
ClusterAllocator.get( ).apply( allocInfo );
final int oldCode = vm.getState( ).getCode( ), newCode = VmState.PENDING.getCode( );

0 comments on commit 1f931b7

Please sign in to comment.