Simplifying code.

Azure · Aug 6, 2012 · 42fd614 · 42fd614
1 parent c504daa
commit 42fd614
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/lib/serviceruntime/roleenvironment.js b/lib/serviceruntime/roleenvironment.js
@@ -423,14 +423,7 @@ RoleEnvironment._processGoalStateChange = function (newGoalState, callback) {
         changes.cancel = function () {
           changes.cancelled = true;
 
-          var newState = {
-            clientId: RoleEnvironment.clientId,
-            incarnation: currentGoalState.incarnation,
-            status: ServiceRuntimeConstants.RoleStatus.RECYCLE,
-            expiration: maxDateTime
-          };
-
-          RoleEnvironment.runtimeClient.setCurrentState(newState, optionalCallback);
+          RoleEnvironment.requestRecycle(optionalCallback);
         }
 
         RoleEnvironment.emit(ServiceRuntimeConstants.CHANGING, changes);
@@ -448,8 +441,6 @@ RoleEnvironment._processGoalStateChange = function (newGoalState, callback) {
               optionalCallback();
             }
           });
-        } else {
-          optionalCallback();
         }
       }
     } else {

diff --git a/test/serviceruntime/roleenvironment-tests.js b/test/serviceruntime/roleenvironment-tests.js
@@ -1177,7 +1177,9 @@ suite('roleenvironment-tests', function () {
 
     azure.RoleEnvironment.on(ServiceRuntimeConstants.CHANGING, function (changes) {
       changes.cancel();
+    });
 
+    sandbox.stub(azure.RoleEnvironment, 'requestRecycle', function () {
       clearInterval(serverGoalStateInterval);
 
       serverVersions.on('close', function () {