You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ms...@apache.org on 2018/07/19 19:07:44 UTC
[1/2] activemq git commit: Bugfix, ambiguous redirect if unset
Repository: activemq
Updated Branches:
refs/heads/master 24b9ae2ed -> d34967e01
Bugfix, ambiguous redirect if unset
Thanks to Drew Wyatt<dr...@carshop.co.uk>
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6d24f88d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6d24f88d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6d24f88d
Branch: refs/heads/master
Commit: 6d24f88d16e00fb915a6abd6e8fdcf192c54dfe7
Parents: 46160c7
Author: Marc Schoechlin <ma...@vico-research.com>
Authored: Thu Jul 19 20:59:19 2018 +0200
Committer: Marc Schoechlin <ma...@vico-research.com>
Committed: Thu Jul 19 20:59:19 2018 +0200
----------------------------------------------------------------------
assembly/src/release/bin/activemq | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/6d24f88d/assembly/src/release/bin/activemq
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 0edc908..358204b 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -325,8 +325,12 @@ invokeJar(){
DOIT_POSTFIX=" - $ACTIVEMQ_USER"
echo "INFO: changing to user '$ACTIVEMQ_USER' to invoke java"
fi
+
# Execute java binary
if [ -n "$TASK_TODO" ] && [ "$TASK_TODO" != "stop" ];then
+ if [ -z "$ACTIVEMQ_OUT" ]; then
+ ACTIVEMQ_OUT="/dev/null"
+ fi
$EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
-Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
-Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
[2/2] activemq git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/activemq
Posted by ms...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d34967e0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d34967e0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d34967e0
Branch: refs/heads/master
Commit: d34967e019779a1c347f3387519f0c446f2c2c73
Parents: 6d24f88 24b9ae2
Author: Marc Schoechlin <ma...@vico-research.com>
Authored: Thu Jul 19 21:07:31 2018 +0200
Committer: Marc Schoechlin <ma...@vico-research.com>
Committed: Thu Jul 19 21:07:31 2018 +0200
----------------------------------------------------------------------
.../activemq/command/XATransactionId.java | 14 +-
.../org/apache/activemq/util/JenkinsHash.java | 258 +++++++++++++++++++
.../store/kahadb/KahaDBPersistenceAdapter.java | 8 +
.../activemq/store/kahadb/MessageDatabase.java | 16 ++
.../broker/BrokerRestartTestSupport.java | 7 +-
.../activemq/broker/XARecoveryBrokerTest.java | 66 +++++
.../org/apache/activemq/bugs/AMQ7013Test.java | 55 ++++
7 files changed, 412 insertions(+), 12 deletions(-)
----------------------------------------------------------------------