Define variable before usage, check $Data for nulls

codykonior · Feb 5, 2018 · 6391c75 · 6391c75
1 parent ca402b2
commit 6391c75
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/PoshRSJob/PoshRSJob.psm1 b/PoshRSJob/PoshRSJob.psm1
@@ -129,6 +129,7 @@ $PoshRS_jobCleanup.PowerShell = [PowerShell]::Create().AddScript({
                 If ($job.Handle.isCompleted -AND (-NOT $Job.Completed)) {
                     #$PoshRS_jobCleanup.Host.UI.WriteVerboseLine("$($Job.Id) completed")
                     $Data = $null
+                    $CaughtErrors = $null
                     Try {
                         $Data = $job.InnerJob.EndInvoke($job.Handle)
                     } Catch {
@@ -156,7 +157,7 @@ $PoshRS_jobCleanup.PowerShell = [PowerShell]::Create().AddScript({
                     #$PoshRS_jobCleanup.Host.UI.WriteVerboseLine("$($Job.Id) Disposing job")
                     $job.InnerJob.dispose()
                     #Return type from Invoke() is a generic collection; need to verify the first index is not NULL
-                    If (($Data.Count -gt 0) -AND (-NOT ($Data.Count -eq 1 -AND $Null -eq $Data[0]))) {
+                    If ($Data -and ($Data.$Count -gt 0) -AND (-NOT ($Data.Count -eq 1 -AND $Null -eq $Data[0]))) {
                         $job.output = $Data
                         $job.HasMoreData = $True
                     }