svn commit: r1559219 - in /jena/trunk: apache-jena/bin/tdbloader2 jena-tdb/bin/tdbloader2

[an...@apache.org]

Author: andy
Date: Fri Jan 17 18:51:01 2014
New Revision: 1559219

URL: http://svn.apache.org/r1559219
Log:
Only try to set SORT_ARGS if not already set

Modified:
    jena/trunk/apache-jena/bin/tdbloader2
    jena/trunk/jena-tdb/bin/tdbloader2

Modified: jena/trunk/apache-jena/bin/tdbloader2
URL: http://svn.apache.org/viewvc/jena/trunk/apache-jena/bin/tdbloader2?rev=1559219&r1=1559218&r2=1559219&view=diff
==============================================================================
--- jena/trunk/apache-jena/bin/tdbloader2 (original)
+++ jena/trunk/apache-jena/bin/tdbloader2 Fri Jan 17 18:51:01 2014
@@ -48,12 +48,14 @@ case "$(uname)" in
 esac
 
 export JENA_CP
-
-export SORT_ARGS="${SORT_ARGS:---buffer-size=50%}"
-## Add --parallel=3 if available.
-if $(sort --parallel=3 < /dev/null 2>/dev/null) 
+if [ -z "$SORT_ARGS" ]
 then
-    SORT_ARGS="$SORT_ARGS --parallel=3"
+    SORT_ARGS="--buffer-size=50%"
+    if $(sort --parallel=3 < /dev/null 2>/dev/null) 
+    then
+	SORT_ARGS="$SORT_ARGS --parallel=3"
+    fi
 fi
+export SORT_ARGS
 
 exec "$JENA_HOME/bin/tdbloader2worker" "$@"

Modified: jena/trunk/jena-tdb/bin/tdbloader2
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/bin/tdbloader2?rev=1559219&r1=1559218&r2=1559219&view=diff
==============================================================================
--- jena/trunk/jena-tdb/bin/tdbloader2 (original)
+++ jena/trunk/jena-tdb/bin/tdbloader2 Fri Jan 17 18:51:01 2014
@@ -43,6 +43,5 @@ then
     fi
 fi
 export SORT_ARGS
-echo $SORT_ARGS
-exit
+
 exec "$TDBROOT/bin/tdbloader2worker" "$@"