You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2010/10/23 04:13:58 UTC
svn commit: r1026545 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Author: gtully
Date: Sat Oct 23 02:13:58 2010
New Revision: 1026545
URL: http://svn.apache.org/viewvc?rev=1026545&view=rev
Log:
fix xbean qdox parser error with static initialiser, use block instead
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=1026545&r1=1026544&r2=1026545&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Sat Oct 23 02:13:58 2010
@@ -88,7 +88,10 @@ public class MessageDatabase extends Ser
public static final String PROPERTY_LOG_SLOW_ACCESS_TIME = "org.apache.activemq.store.kahadb.LOG_SLOW_ACCESS_TIME";
public static final int LOG_SLOW_ACCESS_TIME = Integer.parseInt(System.getProperty(PROPERTY_LOG_SLOW_ACCESS_TIME, "0"));
- protected static final Buffer UNMATCHED = new Buffer(new byte[]{});
+ protected static final Buffer UNMATCHED;
+ static {
+ UNMATCHED = new Buffer(new byte[]{});
+ }
private static final Log LOG = LogFactory.getLog(MessageDatabase.class);
private static final int DEFAULT_DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
@@ -1039,7 +1042,7 @@ public class MessageDatabase extends Ser
Long prev = sd.subscriptionAcks.put(tx, subscriptionKey, sequence);
if (command.getAck() == UNMATCHED) {
- sd.subscriptionAcks.put(tx, subscriptionKey, prev);
+ sd.subscriptionAcks.put(tx, subscriptionKey, prev);
}
// The following method handles deleting un-referenced messages.
removeAckLocation(tx, sd, subscriptionKey, prev);