Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile

This commit is contained in:
Daniel Kulp 2015-08-04 09:40:09 -04:00
parent 42d9fd118d
commit 4ea95911c8
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
View File

@ -162,12 +162,6 @@ public abstract class AbstractRegion implements Region {
return subscriptions;
}
<<<<<<< HEAD
protected List<Subscription> addSubscriptionsForDestination(ConnectionContext context, Destination dest)
throws Exception {
=======
/**
* Updates the counts in RegionStatistics based on whether or not the destination
* is an Advisory Destination or not
@ -223,7 +217,6 @@ public abstract class AbstractRegion implements Region {
}
protected List<Subscription> addSubscriptionsForDestination(ConnectionContext context, Destination dest) throws Exception {
>>>>>>> e4af2eb... https://issues.apache.org/jira/browse/AMQ-5814
List<Subscription> rc = new ArrayList<Subscription>();
// Add all consumers that are interested in the destination.
for (Iterator<Subscription> iter = subscriptions.values().iterator(); iter.hasNext();) {