QPID-5979: Derby/JDBC logs unnecessary "message not found" at WARN on rollback.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1616806 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 16 insertions, 11 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index 338882e6df..835846a5ec 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -388,10 +388,11 @@ public abstract class AbstractBDBMessageStore implements MessageStore
                     OperationStatus status = getMessageMetaDataDb().delete(tx, key);
                     if (status == OperationStatus.NOTFOUND)
                     {
-                        getLogger().info(
-                                "Message not found (attempt to remove failed - probably application initiated rollback) "
-                                +
-                                messageId);
+                        if (getLogger().isDebugEnabled())
+                        {
+                            getLogger().debug("Message id " + messageId
+                                + " not found (attempt to remove failed - probably application initiated rollback)");
+                        }
                     }
 
                     if (getLogger().isDebugEnabled())
@@ -426,7 +427,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore
                     catch(DatabaseException e2)
                     {
                         getLogger().warn(
-                                "Unable to abort transaction after LockConflictExcption on removal of message with id "
+                                "Unable to abort transaction after LockConflictException on removal of message with id "
                                 + messageId,
                                 e2);
                         // rethrow the original log conflict exception, the secondary exception should already have
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
index bb7a726a0c..57142e6e1f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
@@ -473,7 +473,11 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
 
                     if (results == 0)
                     {
-                        getLogger().warn("Message metadata not found for message id " + messageId);
+                        if (getLogger().isDebugEnabled())
+                        {
+                            getLogger().debug("Message id " + messageId
+                                              + " not found (attempt to remove failed - probably application initiated rollback)");
+                        }
                     }
 
                     if (getLogger().isDebugEnabled())
@@ -482,7 +486,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
                     }
 
                     stmt = conn.prepareStatement(DELETE_FROM_MESSAGE_CONTENT);
-                    stmt.setLong(1,messageId);
+                    stmt.setLong(1, messageId);
                     results = stmt.executeUpdate();
                 }
                 finally
@@ -1492,7 +1496,6 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
                 if(stored())
                 {
                     checkMessageStoreOpen();
-                    getLogger().debug("GET CONTENT for message id " + _messageId);
                     data = AbstractJDBCMessageStore.this.getAllContent(_messageId);
                     T metaData = _messageDataRef.getMetaData();
                     if (metaData == null)
@@ -1568,7 +1571,10 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
         @Override
         public void remove()
         {
-            getLogger().debug("REMOVE called on message: " + _messageId);
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().debug("REMOVE called on message: " + _messageId);
+            }
             checkMessageStoreOpen();
 
             int delta = getMetaData().getContentSize();
@@ -1605,7 +1611,6 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
         {
             if (!stored())
             {
-                getLogger().debug("STORING message id " + _messageId);
                 storeMetaData(conn, _messageId, _messageDataRef.getMetaData());
                 AbstractJDBCMessageStore.this.addContent(conn, _messageId,
                                                                _messageDataRef.getData() == null
@@ -1636,7 +1641,6 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
 
                     Pointer(final MessageData<T> ref)
                     {
-                        getLogger().debug("POST COMMIT for message id " + _messageId);
                         _ref = ref;
                     }