activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [8/8] activemq-artemis git commit: Fix compilation issues after merge
Date Thu, 08 Dec 2016 16:18:14 GMT
Fix compilation issues after merge


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8af65594
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8af65594
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8af65594

Branch: refs/heads/ARTEMIS-780
Commit: 8af65594721f2b2ef4449b8adc0ab6ef39277b70
Parents: 4a53f9b
Author: jbertram <jbertram@apache.com>
Authored: Wed Dec 7 22:02:39 2016 -0600
Committer: jbertram <jbertram@apache.com>
Committed: Thu Dec 8 08:43:54 2016 -0600

----------------------------------------------------------------------
 .../activemq/artemis/core/postoffice/impl/SimpleAddressManager.java | 1 +
 .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java       | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8af65594/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
index 0ae9c82..16849e8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
@@ -225,6 +225,7 @@ public class SimpleAddressManager implements AddressManager {
       return addressInfoMap.computeIfPresent(addressName, remappingFunction);
    }
 
+   @Override
    public boolean addOrUpdateAddressInfo(AddressInfo addressInfo) {
       boolean isNew = addAddressInfo(addressInfo);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8af65594/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 237e750..e962aa0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2412,6 +2412,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
       postOffice.removeRoutingType(addressName,routingType);
    }
 
+   @Override
    public boolean createAddressInfo(AddressInfo addressInfo) throws Exception {
       boolean result = postOffice.addAddressInfo(addressInfo);
 


Mime
View raw message