summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core/src
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-08-08 15:43:43 +0000
committerKeith Wall <kwall@apache.org>2014-08-08 15:43:43 +0000
commit60d10e1865481944d8560bfbeea7fdd474ec8fff (patch)
tree0a2b70d4e70ab6264eb467a64dcffe855009843a /qpid/java/broker-core/src
parent9d67cc147702172afbe8c93b88311cd2e5eb6bab (diff)
downloadqpid-python-60d10e1865481944d8560bfbeea7fdd474ec8fff.tar.gz
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
Diffstat (limited to 'qpid/java/broker-core/src')
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java16
1 files changed, 10 insertions, 6 deletions
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;
}