Author: robbie
Date: Wed Nov 28 19:14:07 2012
New Revision: 1414872
URL: http://svn.apache.org/viewvc?rev=1414872&view=rev
Log:
QPID-4461: remove spaces to ensure the log prefix/suffix options are passed
correctly following prior changes to argument construction
merge from trunk r1412822
Modified:
qpid/branches/0.20/qpid/java/common/bin/ (props changed)
qpid/branches/0.20/qpid/java/common/bin/qpid-run
Propchange: qpid/branches/0.20/qpid/java/common/bin/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 28 19:14:07 2012
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/common/bin:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/common/bin:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/java-broker-0-10/qpid/java/common/bin:795950-829653
+/qpid/branches/java-network-refactor/qpid/java/common/bin:805429-821809
+/qpid/branches/qpid-2935/qpid/java/common/bin:1061302-1072333
+/qpid/trunk/qpid/common/bin:796646-796653
+/qpid/trunk/qpid/java/common/bin:1412359,1412822,1413363
Modified: qpid/branches/0.20/qpid/java/common/bin/qpid-run
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/java/common/bin/qpid-run?rev=1414872&r1=1414871&r2=1414872&view=diff
==============================================================================
--- qpid/branches/0.20/qpid/java/common/bin/qpid-run (original)
+++ qpid/branches/0.20/qpid/java/common/bin/qpid-run Wed Nov 28 19:14:07 2012
@@ -88,10 +88,10 @@ SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="-DQPI
if [ -n "$QPID_LOG_PREFIX" ]; then
if [ "X$QPID_LOG_PREFIX" = "XPID" ]; then
log $INFO Using pid in qpid log name prefix
- LOG_PREFIX=" -Dlogprefix=$$"
+ LOG_PREFIX="-Dlogprefix=$$"
else
log $INFO Using qpid logprefix property
- LOG_PREFIX=" -Dlogprefix=$QPID_LOG_PREFIX"
+ LOG_PREFIX="-Dlogprefix=$QPID_LOG_PREFIX"
fi
SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="${LOG_PREFIX}"
fi
@@ -99,10 +99,10 @@ fi
if [ -n "$QPID_LOG_SUFFIX" ]; then
if [ "X$QPID_LOG_SUFFIX" = "XPID" ]; then
log $INFO Using pid in qpid log name suffix
- LOG_SUFFIX=" -Dlogsuffix=$$"
+ LOG_SUFFIX="-Dlogsuffix=$$"
else
log $INFO Using qpig logsuffix property
- LOG_SUFFIX=" -Dlogsuffix=$QPID_LOG_SUFFIX"
+ LOG_SUFFIX="-Dlogsuffix=$QPID_LOG_SUFFIX"
fi
SYSTEM_PROPS[${#SYSTEM_PROPS[@]}]="${LOG_SUFFIX}"
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
