Fudge order of classpath - so that our jars take precedence over what is in...

Fudge order of classpath - so that our jars take precedence over what is in CLASSPATH variable. Sounds logical, hope there is no issue cos of it

core/src/hadoop2-yarn/scala/spark/deploy/yarn/Client.scala

@@ -165,8 +165,8 @@ class Client(conf: Configuration, args: ClientArguments) extends Logging {
     // If log4j present, ensure ours overrides all others
     if (log4jConfLocalRes != null) Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./")
 
-    Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH")
     Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./*")
+    Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH")
     Client.populateHadoopClasspath(yarnConf, env)
     SparkHadoopUtil.setYarnMode(env)
     env("SPARK_YARN_JAR_PATH") = 

core/src/hadoop2-yarn/scala/spark/deploy/yarn/WorkerRunnable.scala

@@ -153,8 +153,8 @@ class WorkerRunnable(container: Container, conf: Configuration, masterAddress: S
       Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./")
     }
 
-    Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH")
     Apps.addToEnvironment(env, Environment.CLASSPATH.name, "./*")
+    Apps.addToEnvironment(env, Environment.CLASSPATH.name, "$CLASSPATH")
     Client.populateHadoopClasspath(yarnConf, env)
 
     System.getenv().filterKeys(_.startsWith("SPARK")).foreach { case (k,v) => env(k) = v }