Check for type less often

Author: Adam Rutland

lib/datapacks.js

@@ -228,16 +228,17 @@ DataPacks.prototype.runDataPackProcess = function(dataPackData, options, onSucce
                 return new Promise(function(resolve) {
 
                     if (result.Total > 0 
+                        && !result.Async 
                         && dataPackData.processType == "Export" 
                         && result.Status != "Complete"
                         && dataPackData.processData
+                        && result.Finished == dataPackData.processData.Finished
                         && (!dataPackData.processData.maxDepth 
                             || dataPackData.processData.maxDepth == -1)
                         && dataPackData.processData.exportPacksMaxSize 
                         && result.Finished > dataPackData.processData.exportPacksMaxSize) {
 
                         containsChildren = false;
-                        dataPackData.processData.exportPacksMaxSize += 10;
 
                         VlocityUtils.verbose('Checking Children records');
 

lib/datapacksbuilder.js

@@ -214,26 +214,26 @@ DataPacksBuilder.prototype.countRecords = function(dataPackData) {
     var self = this;
 
     var count = 0;
+    if (dataPackData) {
+        if (dataPackData.VlocityDataPackData) {
+            var dataPackType = dataPackData.VlocityDataPackType;
 
-    if (dataPackData.VlocityDataPackData) {
-        var dataPackType = dataPackData.VlocityDataPackType;
+            var dataField = self.vlocity.datapacksutils.getDataField(dataPackData);
 
-        var dataField = self.vlocity.datapacksutils.getDataField(dataPackData);
-
-        if (dataField) {
-            count += self.countRecords(dataPackData.VlocityDataPackData[dataField][0]);
-        }
-    } else { 
-        if (Array.isArray(dataPackData)) {
-            dataPackData.forEach(function(childData) {
-                count += self.countRecords(childData);
-            });
-        } else if (dataPackData.VlocityDataPackType == 'SObject') {
-
-            Object.keys(dataPackData).forEach(function(key) {
-                count += self.countRecords(dataPackData[key]);
-            });
-            count++;
+            if (dataField) {
+                count += self.countRecords(dataPackData.VlocityDataPackData[dataField][0]);
+            }
+        } else { 
+            if (Array.isArray(dataPackData)) {
+                dataPackData.forEach(function(childData) {
+                    count += self.countRecords(childData);
+                });
+            } else if (dataPackData.VlocityDataPackType == 'SObject') {
+                Object.keys(dataPackData).forEach(function(key) {
+                    count += self.countRecords(dataPackData[key]);
+                });
+                count++;
+            }
         }
     }