Merge branch 'mguessan-patch-1' into develop

Author: tofi86

src/universalJavaApplicationStub

@@ -218,14 +218,19 @@ else
 	JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null`
 	if [[ $JVMClassPath_RAW == *Array* ]] ; then
 		JVMClassPath=.`/usr/libexec/PlistBuddy -c "print JVMClassPath" "${InfoPlistFile}" 2> /dev/null | grep "    " | sed 's/^ */:/g' | tr -d '\n' | xargs`
+		# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
+		JVMClassPath=`eval "echo ${JVMClassPath}"`
+
 	elif [[ ! -z ${JVMClassPath_RAW} ]] ; then
 		JVMClassPath=${JVMClassPath_RAW}
+		# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
+		JVMClassPath=`eval "echo ${JVMClassPath}"`
+
 	else
 		#default: fallback to OracleJavaFolder
 		JVMClassPath="${JavaFolder}/*"
+		# Do NOT expand the default App.app/Contents/Java/* classpath (#42)
 	fi
-	# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
-	JVMClassPath=`eval "echo ${JVMClassPath}"`
 
 	# read the JVM Default Options
 	JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print :JVMDefaultOptions" "${InfoPlistFile}" 2> /dev/null | grep -o " \-.*" | tr -d '\n' | xargs`