[beam] branch master updated: [BEAM-6102] Move the worker jar before the pipeline jar when using the --dataflowWorkerJar option (#7143)

[lcwik]

This is an automated email from the ASF dual-hosted git repository.

lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 148808a  [BEAM-6102] Move the worker jar before the pipeline jar when 
using the --dataflowWorkerJar option (#7143)
148808a is described below

commit 148808ae76b5a774dba87b8f757e450a7b218f6e
Author: Alan Myrvold <alan.myrv...@comcast.net>
AuthorDate: Tue Nov 27 15:36:44 2018 -0800

    [BEAM-6102] Move the worker jar before the pipeline jar when using the 
--dataflowWorkerJar option (#7143)
---
 .../main/java/org/apache/beam/runners/dataflow/util/GcsStager.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/GcsStager.java
 
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/GcsStager.java
index 0487b5d..ce13343 100644
--- 
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/GcsStager.java
+++ 
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/GcsStager.java
@@ -62,7 +62,9 @@ public class GcsStager implements Stager {
     }
 
     if (dataflowWorkerJar != null && !dataflowWorkerJar.isEmpty()) {
-      filesToStage.add("dataflow-worker.jar=" + dataflowWorkerJar);
+      // Put the user specified worker jar at the start of the classpath, to 
be consistent with the
+      // built in worker order.
+      filesToStage.add(0, "dataflow-worker.jar=" + dataflowWorkerJar);
     }
 
     return stageFiles(filesToStage);