@@ -602,7 +602,7 @@ private boolean isValidSystemVMType(VirtualMachine vm) {
602602 protected void advanceExpunge (VMInstanceVO vm ) throws ResourceUnavailableException , OperationTimedoutException , ConcurrentOperationException {
603603 if (vm == null || vm .getRemoved () != null ) {
604604 if (s_logger .isDebugEnabled ()) {
605- s_logger .debug ("Unable to find vm or vm is destroyed : " + vm );
605+ s_logger .debug ("Unable to find vm or vm is expunged : " + vm );
606606 }
607607 return ;
608608 }
@@ -612,17 +612,17 @@ protected void advanceExpunge(VMInstanceVO vm) throws ResourceUnavailableExcepti
612612
613613 try {
614614 if (!stateTransitTo (vm , VirtualMachine .Event .ExpungeOperation , vm .getHostId ())) {
615- s_logger .debug ("Unable to destroy the vm because it is not in the correct state: " + vm );
616- throw new CloudRuntimeException ("Unable to destroy " + vm );
615+ s_logger .debug ("Unable to expunge the vm because it is not in the correct state: " + vm );
616+ throw new CloudRuntimeException ("Unable to expunge " + vm );
617617
618618 }
619619 } catch (final NoTransitionException e ) {
620- s_logger .debug ("Unable to destroy the vm because it is not in the correct state: " + vm );
621- throw new CloudRuntimeException ("Unable to destroy " + vm , e );
620+ s_logger .debug ("Unable to expunge the vm because it is not in the correct state: " + vm );
621+ throw new CloudRuntimeException ("Unable to expunge " + vm , e );
622622 }
623623
624624 if (s_logger .isDebugEnabled ()) {
625- s_logger .debug ("Destroying vm " + vm );
625+ s_logger .debug ("Expunging vm " + vm );
626626 }
627627
628628 final VirtualMachineProfile profile = new VirtualMachineProfileImpl (vm );
0 commit comments