Permalink
Browse files

fixes to rt:5977 and rt:5984

  • Loading branch information...
2 parents 45f28d5 + 745d2f4 commit 580c6bd9ed3dfae3a38b13a58ce93275bd8119c1 @grze grze committed Feb 3, 2012
@@ -18,7 +18,11 @@ public PublicAddressStateCallback( ) {
@Override
public void fire( DescribePublicAddressesResponseType reply ) {
this.getSubject( ).getState( ).setPublicAddressing( true );
- Addresses.getAddressManager( ).update( this.getSubject( ), reply.getAddresses( ) );
+ try {
+ Addresses.getAddressManager( ).update( this.getSubject( ), reply.getAddresses( ) );
+ } catch ( Exception ex ) {
+ LOG.error( ex );
+ }
}
@Override
@@ -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 580c6bd

Please sign in to comment.