You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2014/01/24 15:55:25 UTC
[1/2] git commit: Fixes APLO-346: Debug log doesn't log a deleting
queue
Updated Branches:
refs/heads/trunk 85c1f15c4 -> 57f5287d0
Fixes APLO-346: Debug log doesn't log a deleting queue
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/543bd15f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/543bd15f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/543bd15f
Branch: refs/heads/trunk
Commit: 543bd15f481b757f8c9f547a4b318c8b38f162b6
Parents: 85c1f15
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Fri Jan 24 09:41:15 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Fri Jan 24 09:41:15 2014 -0500
----------------------------------------------------------------------
.../scala/org/apache/activemq/apollo/broker/LocalRouter.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/543bd15f/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
----------------------------------------------------------------------
diff --git a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
index b0cc7e4..129956c 100644
--- a/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
+++ b/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
@@ -1335,7 +1335,7 @@ class LocalRouter(val virtual_host:VirtualHost) extends BaseService with Router
}
def _destroy_queue(queue: Queue) {
- assert(service_state.is_starting_or_started, "Can't destroy.. allready stopped")
+ assert(service_state.is_starting_or_started, "Can't destroy.. already stopped")
on_queue_destroy_start
queue.stop(^{
var metrics = queue.get_queue_metrics
@@ -1358,10 +1358,12 @@ class LocalRouter(val virtual_host:VirtualHost) extends BaseService with Router
if (queue.tune_persistent) {
virtual_host.store.remove_queue(queue.store_id) { x =>
dispatch_queue {
+ debug("destroyed queue: " + queue.id)
on_queue_destroy_end
}
}
} else {
+ debug("destroyed queue: " + queue.id)
on_queue_destroy_end
}
}
[2/2] git commit: Update dependency versions.
Posted by ch...@apache.org.
Update dependency versions.
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/57f5287d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/57f5287d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/57f5287d
Branch: refs/heads/trunk
Commit: 57f5287d0553bdb23edde229d0156d3a859e48e5
Parents: 543bd15
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Fri Jan 24 09:55:20 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Fri Jan 24 09:55:20 2014 -0500
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/57f5287d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3897215..f2cb6ad 100755
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
<rome-version>0.8</rome-version>
<slf4j-version>1.6.1</slf4j-version>
- <mqtt-client-version>1.6</mqtt-client-version>
+ <mqtt-client-version>1.7</mqtt-client-version>
<jaxb-api-version>2.1</jaxb-api-version>
<jaxb-version>2.1.6</jaxb-version>
@@ -97,7 +97,7 @@
<xbean-version>3.4</xbean-version>
<felix-version>1.0.0</felix-version>
- <hawtdispatch-version>1.18</hawtdispatch-version>
+ <hawtdispatch-version>1.19</hawtdispatch-version>
<hawtbuf-version>1.9</hawtbuf-version>
<stompjms-version>1.18</stompjms-version>