Modified the 'moveTo' method of the virtual and physical resources to…

… be more reliable
OpenMarshal · May 31, 2017 · 44b38fe · 44b38fe
1 parent 0a41414
commit 44b38fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/lib/resource/physical/PhysicalResource.js b/lib/resource/physical/PhysicalResource.js
@@ -37,16 +37,17 @@ var PhysicalResource = (function (_super) {
             return;
         }
         var oldName = this.name;
-        this.name = newName;
         this.removeFromParent(function (e) {
             if (e) {
                 _this.name = oldName;
                 callback(e);
             }
-            else
+            else {
+                _this.name = newName;
                 parent.addChild(_this, function (e) {
                     callback(e);
                 });
+            }
         });
     };
     PhysicalResource.prototype.rename = function (newName, callback) {

diff --git a/lib/resource/virtual/VirtualResource.js b/lib/resource/virtual/VirtualResource.js
@@ -40,16 +40,17 @@ var VirtualResource = (function (_super) {
             return;
         }
         var oldName = this.name;
-        this.name = newName;
         this.removeFromParent(function (e) {
             if (e) {
                 _this.name = oldName;
                 callback(e);
             }
-            else
+            else {
+                _this.name = newName;
                 parent.addChild(_this, function (e) {
                     callback(e);
                 });
+            }
         });
     };
     VirtualResource.prototype.rename = function (newName, callback) {

diff --git a/src/resource/physical/PhysicalResource.ts b/src/resource/physical/PhysicalResource.ts
@@ -39,17 +39,19 @@ export abstract class PhysicalResource extends StandardResource
         }
 
         const oldName = this.name;
-        this.name = newName;
         this.removeFromParent((e) => {
             if(e)
             {
                 this.name = oldName;
                 callback(e);
             }
             else
+            {
+                this.name = newName;
                 parent.addChild(this, (e) => {
                     callback(e);
                 })
+            }
         })
     }
     rename(newName : string, callback : Return2Callback<string, string>)

diff --git a/src/resource/virtual/VirtualResource.ts b/src/resource/virtual/VirtualResource.ts
@@ -41,17 +41,19 @@ export abstract class VirtualResource extends StandardResource
         }
 
         const oldName = this.name;
-        this.name = newName;
         this.removeFromParent((e) => {
             if(e)
             {
                 this.name = oldName;
                 callback(e);
             }
             else
+            {
+                this.name = newName;
                 parent.addChild(this, (e) => {
                     callback(e);
                 })
+            }
         })
     }
     rename(newName : string, callback : Return2Callback<string, string>)