Author: sebb
Date: Fri Nov 7 17:21:36 2008
New Revision: 712338
URL: http://svn.apache.org/viewvc?rev=712338&view=rev
Log:
Process JVM_ARGS last so they can override settings in the file
Modified:
jakarta/jmeter/trunk/bin/jmeter
jakarta/jmeter/trunk/bin/jmeter.bat
Modified: jakarta/jmeter/trunk/bin/jmeter
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter?rev=712338&r1=712337&r2=712338&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter (original)
+++ jakarta/jmeter/trunk/bin/jmeter Fri Nov 7 17:21:36 2008
@@ -84,4 +84,4 @@
ARGS="$SERVER $HEAP $NEW $SURVIVOR $TENURING $EVACUATION $RMIGC $PERM"
-java $JVM_ARGS $ARGS -jar `dirname $0`/ApacheJMeter.jar "$@"
+java $ARGS $JVM_ARGS -jar `dirname $0`/ApacheJMeter.jar "$@"
Modified: jakarta/jmeter/trunk/bin/jmeter.bat
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.bat?rev=712338&r1=712337&r2=712338&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.bat (original)
+++ jakarta/jmeter/trunk/bin/jmeter.bat Fri Nov 7 17:21:36 2008
@@ -92,7 +92,7 @@
rem Collect the settings defined above
set ARGS=%HEAP% %NEW% %SURVIVOR% %TENURING% %EVACUATION% %RMIGC% %PERM% %DDRAW%
-%JM_START% %JM_LAUNCH% %JVM_ARGS% %ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar"
%JMETER_CMD_LINE_ARGS%
+%JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar"
%JMETER_CMD_LINE_ARGS%
rem If the errorlevel is not zero, then display it and pause
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
