File tree Expand file tree Collapse file tree 2 files changed +20
-16
lines changed Expand file tree Collapse file tree 2 files changed +20
-16
lines changed Original file line number Diff line number Diff line change @@ -103,7 +103,7 @@ class PoolWorker {
103
103
this . activeJobs -= 1 ;
104
104
this . onJobDone ( ) ;
105
105
if ( err ) {
106
- jobCallback ( err instanceof Error ? err : new Error ( err ) ) ;
106
+ jobCallback ( err instanceof Error ? err : new Error ( err ) , arg ) ;
107
107
} else {
108
108
jobCallback ( null , arg ) ;
109
109
}
@@ -114,22 +114,24 @@ class PoolWorker {
114
114
callback ( eachErr ) ;
115
115
return ;
116
116
}
117
+ let bufferPosition = 0 ;
118
+ if ( result . result ) {
119
+ result . result = result . result . map ( ( r ) => {
120
+ if ( r . buffer ) {
121
+ const buffer = buffers [ bufferPosition ] ;
122
+ bufferPosition += 1 ;
123
+ if ( r . string ) {
124
+ return buffer . toString ( 'utf-8' ) ;
125
+ }
126
+ return buffer ;
127
+ }
128
+ return r . data ;
129
+ } ) ;
130
+ }
117
131
if ( error ) {
118
- callback ( this . fromErrorObj ( error ) ) ;
132
+ callback ( this . fromErrorObj ( error ) , result ) ;
119
133
return ;
120
134
}
121
- let bufferPosition = 0 ;
122
- result . result = result . result . map ( ( r ) => {
123
- if ( r . buffer ) {
124
- const buffer = buffers [ bufferPosition ] ;
125
- bufferPosition += 1 ;
126
- if ( r . string ) {
127
- return buffer . toString ( 'utf-8' ) ;
128
- }
129
- return buffer ;
130
- }
131
- return r . data ;
132
- } ) ;
133
135
callback ( null , result ) ;
134
136
} ) ;
135
137
break ;
Original file line number Diff line number Diff line change @@ -20,12 +20,14 @@ function pitch() {
20
20
resolve : this . resolve ,
21
21
optionsContext : this . options . context ,
22
22
} , ( err , r ) => {
23
+ if ( r ) {
24
+ r . fileDependencies . forEach ( d => this . addDependency ( d ) ) ;
25
+ r . contextDependencies . forEach ( d => this . addContextDependency ( d ) ) ;
26
+ }
23
27
if ( err ) {
24
28
callback ( err ) ;
25
29
return ;
26
30
}
27
- r . fileDependencies . forEach ( d => this . addDependency ( d ) ) ;
28
- r . contextDependencies . forEach ( d => this . addContextDependency ( d ) ) ;
29
31
callback ( null , ...r . result ) ;
30
32
} ) ;
31
33
}
You can’t perform that action at this time.
0 commit comments