Merge pull request apache#55 from RevolutionAnalytics/master

delay object loading to avoid namespace issues
davies · Jul 13, 2014 · 388e64d · 388e64d
2 parents e1f95b6 + 86f30c3
commit 388e64d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/inst/worker/worker.R b/pkg/inst/worker/worker.R
@@ -46,9 +46,6 @@ if (depsLen > 0) {
   depsFile <- file(depsFileName, open="wb")
   writeBin(execFunctionDeps, depsFile, endian="big")
   close(depsFile)
-
-  load(depsFileName)
-  unlink(depsFileName)
 }
 
 # Include packages as required
@@ -57,6 +54,11 @@ for (pkg in packageNames) {
   suppressPackageStartupMessages(require(as.character(pkg), character.only=TRUE))
 }
 
+if (depsLen > 0) {
+	load(depsFileName)
+	unlink(depsFileName)
+}
+
 # Read and set broadcast variables
 numBroadcastVars <- readInt(inputCon)
 if (numBroadcastVars > 0) {