You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/08/25 18:22:46 UTC
[4/8] activemq-artemis git commit: Missing @Override fixes
Missing @Override fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d57378f2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d57378f2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d57378f2
Branch: refs/heads/master
Commit: d57378f2afba056b0f97daf35d27d11ba5dd0213
Parents: 9d0dcf7
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Aug 25 12:08:39 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:22:32 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/jms/client/ActiveMQConnectionFactory.java | 4 ++++
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d57378f2/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index 183745d..ce531f5 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -154,18 +154,22 @@ public class ActiveMQConnectionFactory implements ConnectionFactoryOptions, Exte
}
}
+ @Override
public String getDeserializationBlackList() {
return deserializationBlackList;
}
+ @Override
public void setDeserializationBlackList(String blackList) {
this.deserializationBlackList = blackList;
}
+ @Override
public String getDeserializationWhiteList() {
return deserializationWhiteList;
}
+ @Override
public void setDeserializationWhiteList(String whiteList) {
this.deserializationWhiteList = whiteList;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d57378f2/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 25511b0..dba7e5b 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
@@ -381,6 +381,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
this.serviceRegistry = serviceRegistry == null ? new ServiceRegistryImpl() : serviceRegistry;
}
+ @Override
public ReloadManager getReloadManager() {
return reloadManager;
}