svn commit: r1435558 - /jena/trunk/jena-fuseki/fuseki

[an...@apache.org]

Author: andy
Date: Sat Jan 19 14:37:43 2013
New Revision: 1435558

URL: http://svn.apache.org/viewvc?rev=1435558&view=rev
Log:
JENA-376 : Either use options as given or use defaults, not append defaults to any given.

Modified:
    jena/trunk/jena-fuseki/fuseki

Modified: jena/trunk/jena-fuseki/fuseki
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/fuseki?rev=1435558&r1=1435557&r2=1435558&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/fuseki (original)
+++ jena/trunk/jena-fuseki/fuseki Sat Jan 19 14:37:43 2013
@@ -97,6 +97,12 @@ then
 
 fi
 
+# Deal with more Cygwin path issues
+if [ "$cygwin" == "true" ]
+then
+  FUSEKI_HOME=`cygpath -w "$FUSEKI_HOME"`
+ fi
+
 #echo "DEBUG: FUSEKI_HOME=$FUSEKI_HOME"
 
 if [ ! -e "$FUSEKI_HOME" ]
@@ -166,7 +172,7 @@ fi
 #
 
 # Some JVM settings
-JAVA_OPTIONS+=("-Dlog4j.configuration=log4j.properties" "-Xmx1200M")
+JAVA_OPTIONS=${JAVA_OPTIONS:--Dlog4j.configuration=log4j.properties -Xmx1200M}
 
 # Run command
 if [ -z "$FUSEKI_ARGS" ]
@@ -202,12 +208,6 @@ start() {
     fi
   fi
   
-  # Deal with more Cygwin path issues
-  if [ "$cygwin" == "true" ]
-  then
-    FUSEKI_HOME=`cygpath -w "$FUSEKI_HOME"`
-  fi
-
   # echo "Redirecting Fuseki stderr/stdout to $FUSEKI_LOGS_STDERROUT"
   exec "${RUN_CMD[@]}" &> "$FUSEKI_LOGS_STDERROUT" &
   disown $!
@@ -235,8 +235,6 @@ stop() {
   echo "OK"
 }
 
-
-
 case $1 in
   start)
     start