[1/3] activemq-artemis git commit: NO-JIRA Removing System.out left by mistake

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/3] activemq-artemis git commit: NO-JIRA Removing System.out left by mistake

jbertram
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 26f987b69 -> e13e014c6


NO-JIRA Removing System.out left by mistake


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

Branch: refs/heads/master
Commit: 1ce5d1f758d034869d5937c9be4fad9db864950e
Parents: 26f987b
Author: Clebert Suconic <[hidden email]>
Authored: Sun Mar 12 22:58:16 2017 -0400
Committer: Clebert Suconic <[hidden email]>
Committed: Mon Mar 13 08:58:46 2017 -0400

----------------------------------------------------------------------
 .../artemis/core/management/impl/ActiveMQServerControlImpl.java     | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ce5d1f7/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 9c8c66f..734933a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -741,7 +741,6 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
                              int maxConsumers,
                              boolean purgeOnNoConsumers,
                              boolean autoCreateAddress) throws Exception {
-      System.out.println("Target===================================called!");
       checkStarted();
 
       clearIO();

Reply | Threaded
Open this post in threaded view
|

[3/3] activemq-artemis git commit: This closes #1088

jbertram
This closes #1088


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

Branch: refs/heads/master
Commit: e13e014c6d0f43bfe7cc282d2617f8cb2e0c0090
Parents: 26f987b afe97cd
Author: Justin Bertram <[hidden email]>
Authored: Mon Mar 13 10:28:17 2017 -0500
Committer: Justin Bertram <[hidden email]>
Committed: Mon Mar 13 10:28:17 2017 -0500

----------------------------------------------------------------------
 .../core/management/impl/ActiveMQServerControlImpl.java        | 1 -
 .../impl/journal/AbstractJournalStorageManager.java            | 6 +++++-
 .../activemq/artemis/core/server/ActiveMQServerLogger.java     | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/3] activemq-artemis git commit: ARTEMIS-1033 Fixing NPE on PageTX and reload

jbertram
In reply to this post by jbertram
ARTEMIS-1033 Fixing NPE on PageTX and reload


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

Branch: refs/heads/master
Commit: afe97cdb0fa89aa2681f830de5517e3efb1e2a25
Parents: 1ce5d1f
Author: Clebert Suconic <[hidden email]>
Authored: Mon Mar 13 08:56:14 2017 -0400
Committer: Clebert Suconic <[hidden email]>
Committed: Mon Mar 13 09:07:26 2017 -0400

----------------------------------------------------------------------
 .../impl/journal/AbstractJournalStorageManager.java            | 6 +++++-
 .../activemq/artemis/core/server/ActiveMQServerLogger.java     | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/afe97cdb/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 8311057..4ba8e82 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -960,7 +960,11 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
 
                      PageTransactionInfo pageTX = pagingManager.getTransaction(pageUpdate.pageTX);
 
-                     pageTX.onUpdate(pageUpdate.recods, null, null);
+                     if (pageTX == null) {
+                        ActiveMQServerLogger.LOGGER.journalCannotFindPageTX(pageUpdate.pageTX);
+                     } else {
+                        pageTX.onUpdate(pageUpdate.recods, null, null);
+                     }
                   } else {
                      PageTransactionInfoImpl pageTransactionInfo = new PageTransactionInfoImpl();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/afe97cdb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index b79806a..9152eb5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1566,4 +1566,10 @@ public interface ActiveMQServerLogger extends BasicLogger {
    @Message(id = 224074, value = "Failed to purge queue {0} on no consumers", format = Message.Format.MESSAGE_FORMAT)
    void failedToPurgeQueue(@Cause Exception e, SimpleString bindingName);
 
+   @LogMessage(level = Logger.Level.ERROR)
+   @Message(id = 224075, value = "Cannot find pageTX id = {0}", format = Message.Format.MESSAGE_FORMAT)
+   void journalCannotFindPageTX(Long id);
+
+
+
 }