[jboss-cvs] JBossAS SVN: r101684 - branches/JBPAPP_5_0/main/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2010-03-01 13:12:46 -0500 (Mon, 01 Mar 2010)
New Revision: 101684

Modified:
   branches/JBPAPP_5_0/main/src/bin/run.bat
Log:
Backport fix for JBAS-6725 from trunk

Modified: branches/JBPAPP_5_0/main/src/bin/run.bat
===================================================================
--- branches/JBPAPP_5_0/main/src/bin/run.bat	2010-03-01 18:11:10 UTC (rev 101683)
+++ branches/JBPAPP_5_0/main/src/bin/run.bat	2010-03-01 18:12:46 UTC (rev 101684)
@@ -39,11 +39,8 @@
   set "PROGNAME=run.bat"
 )
 
-if "x%JAVA_OPTS%" == "x" (
-  set "JAVA_OPTS=-Dprogram.name=%PROGNAME%"
-) else (
-  set "JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%"
-)
+rem Setup JBoss specific properties
+set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
 
 if "x%JAVA_HOME%" == "x" (
   set  JAVA=java