Merge pull request #68 from hackbac/hackbac/issue-54

[Issue #54] Fix NilClass evaluation
yatish27 · Jul 13, 2017 · 3ff3f41 · 3ff3f41
2 parents 7423050 + d9ef244
commit 3ff3f41
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/salesforce_bulk_api/job.rb b/lib/salesforce_bulk_api/job.rb
@@ -169,12 +169,13 @@ def get_job_result(return_result, timeout)
         state = []
         Timeout::timeout(timeout, SalesforceBulkApi::JobTimeout) do
           while true
-            if self.check_job_status['state'][0] == 'Closed'
+            job_status = self.check_job_status
+            if job_status && job_status['state'] && job_status['state'][0] == 'Closed'
               batch_statuses = {}
 
               batches_ready = @batch_ids.all? do |batch_id|
                 batch_state = batch_statuses[batch_id] = self.check_batch_status(batch_id)
-                batch_state['state'][0] != "Queued" && batch_state['state'][0] != "InProgress"
+                batch_state && batch_state['state'] && batch_state['state'][0] && !['Queued', 'InProgress'].include?(batch_state['state'][0])
               end
 
               if batches_ready