activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r955221 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: broker/region/Topic.java store/kahadb/KahaDBTransactionStore.java
Date Wed, 16 Jun 2010 12:49:24 GMT
Author: rajdavies
Date: Wed Jun 16 12:49:24 2010
New Revision: 955221

URL: http://svn.apache.org/viewvc?rev=955221&view=rev
Log:
handle Future correctly passed back from the store

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java?rev=955221&r1=955220&r2=955221&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
Wed Jun 16 12:49:24 2010
@@ -419,7 +419,7 @@ public class Topic extends BaseDestinati
 
                 waitForSpace(context, systemUsage.getStoreUsage(), getStoreUsageHighWaterMark(),
logMessage);
             }      
-            topicStore.asyncAddTopicMessage(context, message);      
+            result = topicStore.asyncAddTopicMessage(context, message);      
         }
 
         message.incrementReferenceCount();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java?rev=955221&r1=955220&r2=955221&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBTransactionStore.java
Wed Jun 16 12:49:24 2010
@@ -182,8 +182,7 @@ public class KahaDBTransactionStore impl
 
             @Override
             public Future<Object> asyncAddTopicMessage(ConnectionContext context, Message
message) throws IOException {
-                KahaDBTransactionStore.this.asyncAddTopicMessage(context, getDelegate(),
message);
-                return AbstractMessageStore.FUTURE;
+                return KahaDBTransactionStore.this.asyncAddTopicMessage(context, getDelegate(),
message);
             }
 
             @Override



Mime
View raw message