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/09/14 15:55:01 UTC
[1/2] activemq-artemis git commit: Add missing @Overrides
Repository: activemq-artemis
Updated Branches:
refs/heads/master 665281a55 -> afee9247e
Add missing @Overrides
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7bff07d5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7bff07d5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7bff07d5
Branch: refs/heads/master
Commit: 7bff07d5b1b2a0c9c49694a68aaf12d0d5082771
Parents: 665281a
Author: Ville Skytt� <vi...@iki.fi>
Authored: Wed Sep 14 13:22:20 2016 +0300
Committer: Ville Skytt� <vi...@iki.fi>
Committed: Wed Sep 14 13:22:20 2016 +0300
----------------------------------------------------------------------
.../artemis/core/server/ActiveMQScheduledComponent.java | 1 +
.../proton/plug/ActiveMQProtonConnectionCallback.java | 1 +
.../plug/context/server/ProtonServerConnectionContext.java | 1 +
.../activemq/artemis/core/paging/impl/PageSyncTimer.java | 1 +
.../activemq/artemis/core/paging/impl/PagingManagerImpl.java | 3 +++
.../activemq/artemis/core/server/files/FileStoreMonitor.java | 1 +
.../artemis/core/server/reload/ReloadManagerImpl.java | 1 +
.../activemq/artemis/tests/unit/util/FakePagingManager.java | 7 ++++---
8 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
index 4d503eb..76b20f9 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
@@ -113,6 +113,7 @@ public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, R
}
+ @Override
public void run() {
delayed.decrementAndGet();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
index e3de595..6e6a405 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
@@ -72,6 +72,7 @@ public class ActiveMQProtonConnectionCallback implements AMQPConnectionCallback
return result;
}
+ @Override
public boolean isSupportsAnonymous() {
boolean supportsAnonymous = false;
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
index 4124c2f..83048d1 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
@@ -82,6 +82,7 @@ public class ProtonServerConnectionContext extends AbstractConnectionContext imp
}
}
+ @Override
public Symbol[] getConnectionCapabilitiesOffered() {
return new Symbol[]{DELAYED_DELIVERY};
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
index 37cffb5..5417439 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
@@ -76,6 +76,7 @@ final class PageSyncTimer extends ActiveMQScheduledComponent {
syncOperations.add(ctx);
}
+ @Override
public void run() {
super.run();
tick();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
index a657a22..99074f3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
@@ -90,6 +90,7 @@ public final class PagingManagerImpl implements PagingManager {
this(pagingSPI, addressSettingsRepository, -1);
}
+ @Override
public void addBlockedStore(PagingStore store) {
blockedStored.add(store);
}
@@ -164,10 +165,12 @@ public final class PagingManagerImpl implements PagingManager {
return diskFull;
}
+ @Override
public boolean isUsingGlobalSize() {
return maxSize > 0;
}
+ @Override
public boolean isGlobalFull() {
return diskFull || maxSize > 0 && globalSizeBytes.get() > maxSize;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java
index a5259bd..6fc2409 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/files/FileStoreMonitor.java
@@ -72,6 +72,7 @@ public class FileStoreMonitor extends ActiveMQScheduledComponent {
}
+ @Override
public void run() {
super.run();
tick();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
index 43fe54c..8bce62d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/reload/ReloadManagerImpl.java
@@ -42,6 +42,7 @@ public class ReloadManagerImpl extends ActiveMQScheduledComponent implements Rel
super(scheduledExecutorService, executor, checkPeriod, TimeUnit.MILLISECONDS, false);
}
+ @Override
public void run() {
super.run();
tick();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7bff07d5/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
index bbaa3a3..500a81f 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/FakePagingManager.java
@@ -115,9 +115,10 @@ public final class FakePagingManager implements PagingManager {
}
/*
- * (non-Javadoc)
- * @see org.apache.activemq.artemis.core.paging.PagingManager#isGlobalFull()
- */
+ * (non-Javadoc)
+ * @see org.apache.activemq.artemis.core.paging.PagingManager#isGlobalFull()
+ */
+ @Override
public boolean isGlobalFull() {
return false;
}
[2/2] activemq-artemis git commit: This closes #775
Posted by cl...@apache.org.
This closes #775
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/afee9247
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/afee9247
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/afee9247
Branch: refs/heads/master
Commit: afee9247ef3433865d8c483006c1edc334180152
Parents: 665281a 7bff07d
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Sep 14 11:54:51 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 14 11:54:51 2016 -0400
----------------------------------------------------------------------
.../artemis/core/server/ActiveMQScheduledComponent.java | 1 +
.../proton/plug/ActiveMQProtonConnectionCallback.java | 1 +
.../plug/context/server/ProtonServerConnectionContext.java | 1 +
.../activemq/artemis/core/paging/impl/PageSyncTimer.java | 1 +
.../activemq/artemis/core/paging/impl/PagingManagerImpl.java | 3 +++
.../activemq/artemis/core/server/files/FileStoreMonitor.java | 1 +
.../artemis/core/server/reload/ReloadManagerImpl.java | 1 +
.../activemq/artemis/tests/unit/util/FakePagingManager.java | 7 ++++---
8 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------