Added trap handler for cluster.waitForJobCompletion(), adjust logic for domain extraction on extractPrincipalIdentifiers() to be more precise

Author: cloudcms

js/gitana/Chainable.js

@@ -554,12 +554,18 @@
                 }
                 else if (principal["_doc"])
                 {
-                    identifiers["domain"] = defaultDomainId;
+                    identifiers["domain"] = principal["domainId"];
+                    if (!identifiers["domain"]) {
+                        identifiers["domain"] = defaultDomainId;
+                    }
                     identifiers["principal"] = principal["_doc"];
                 }
                 else if (principal["name"])
                 {
-                    identifiers["domain"] = defaultDomainId;
+                    identifiers["domain"] = principal["domainId"];
+                    if (!identifiers["domain"]) {
+                        identifiers["domain"] = defaultDomainId;
+                    }
                     identifiers["principal"] = principal["name"];
                 }
 

js/gitana/cluster/Cluster.js

@@ -238,16 +238,20 @@
             {
                 window.setTimeout(function() {
 
-                    Chain(chainable).readJob(jobId).then(function() {
+                    Chain(chainable).trap(function(e) {
+                        if (e) { console.log(e); }
+                        callback(null, e);
+                        return false;
+                    }).readJob(jobId).then(function() {
 
                         if(progressCallback && Gitana.isFunction(progressCallback)) {
                             progressCallback(this);
                         }
 
-                        if (this.state == "FINISHED") {
+                        if (this.state === "FINISHED") {
                             callback(this);
                             chainable.next();
-                        } else if (this.state == "ERROR") {
+                        } else if (this.state === "ERROR") {
                             callback(this);
                             chainable.next();
                         } else {