Skip to content

Commit 388e64d

Browse files
committed
Merge pull request apache#55 from RevolutionAnalytics/master
delay object loading to avoid namespace issues
2 parents e1f95b6 + 86f30c3 commit 388e64d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

pkg/inst/worker/worker.R

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ if (depsLen > 0) {
4646
depsFile <- file(depsFileName, open="wb")
4747
writeBin(execFunctionDeps, depsFile, endian="big")
4848
close(depsFile)
49-
50-
load(depsFileName)
51-
unlink(depsFileName)
5249
}
5350

5451
# Include packages as required
@@ -57,6 +54,11 @@ for (pkg in packageNames) {
5754
suppressPackageStartupMessages(require(as.character(pkg), character.only=TRUE))
5855
}
5956

57+
if (depsLen > 0) {
58+
load(depsFileName)
59+
unlink(depsFileName)
60+
}
61+
6062
# Read and set broadcast variables
6163
numBroadcastVars <- readInt(inputCon)
6264
if (numBroadcastVars > 0) {

0 commit comments

Comments
 (0)