diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
| commit | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (patch) | |
| tree | dcfb94e75656c6c239fc3dcb754cd2015126424d /java/common/bin/qpid-run | |
| parent | 5eb354b338bb8d8fcd35b6ac3fb33f8103e757c3 (diff) | |
| download | qpid-python-ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5.tar.gz | |
Undo bad merge from trunk - merged at wrong level.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/bin/qpid-run')
| -rwxr-xr-x | java/common/bin/qpid-run | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run index ef4363e88b..15d88992df 100755 --- a/java/common/bin/qpid-run +++ b/java/common/bin/qpid-run @@ -77,10 +77,7 @@ fi #Set the default system properties that we'll use now that they have #all been initialised -declare -a SYSTEM_PROPS -SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="-Damqj.logging.level=$AMQJ_LOGGING_LEVEL" -SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="-DQPID_HOME=$QPID_HOME" -SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="-DQPID_WORK=$QPID_WORK" +SYSTEM_PROPS="-Damqj.logging.level=$AMQJ_LOGGING_LEVEL -DQPID_HOME=$QPID_HOME -DQPID_WORK=$QPID_WORK" #If logprefix or logsuffix set to use PID make that happen #Otherwise just pass the value through for these props @@ -93,7 +90,7 @@ if [ -n "$QPID_LOG_PREFIX" ]; then log $INFO Using qpid logprefix property LOG_PREFIX=" -Dlogprefix=$QPID_LOG_PREFIX" fi - SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="${LOG_PREFIX}" + SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_PREFIX}" fi if [ -n "$QPID_LOG_SUFFIX" ]; then @@ -104,10 +101,10 @@ if [ -n "$QPID_LOG_SUFFIX" ]; then log $INFO Using qpig logsuffix property LOG_SUFFIX=" -Dlogsuffix=$QPID_LOG_SUFFIX" fi - SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="${LOG_SUFFIX}" + SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_SUFFIX}" fi -log $INFO System Properties set to ${SYSTEM_PROPS[@]} +log $INFO System Properties set to $SYSTEM_PROPS log $INFO QPID_OPTS set to $QPID_OPTS program=$(basename $0) @@ -257,6 +254,6 @@ if $cygwin; then JAVA=$(cygpath -u $JAVA) fi -COMMAND=($JAVA $JAVA_VM $QPID_PNAME $JAVA_GC $JAVA_MEM "${SYSTEM_PROPS[@]}" $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") +COMMAND=($JAVA $JAVA_VM $QPID_PNAME $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") DISPATCH |