resolve issue with kahaDB based variant of AMQ2149Test - revert http://svn.apache.org/viewvc?rev=958330&view=rev

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

activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java

@@ -528,7 +528,7 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
     }
 
    @Override
-public void add(ConnectionContext context, Destination destination) throws Exception {
+    public void add(ConnectionContext context, Destination destination) throws Exception {
         synchronized(pendingLock) {
             super.add(context, destination);
             pending.add(context, destination);

activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java

@@ -208,7 +208,7 @@ public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor i
         if (last != null) {
             last.decrementReferenceCount();
         }
-        if (size==0 && isStarted() && useCache && hasSpace() ) {
+        if (size==0 && isStarted() && useCache && hasSpace() && isStoreEmpty()) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug(regionDestination.getActiveMQDestination().getPhysicalName() + " enabling cache on last remove");
             }

activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149KahaDBTest.java

@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.bugs;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+
+public class AMQ2149KahaDBTest extends AMQ2149Test {
+
+    @Override
+    protected void configurePersistenceAdapter(BrokerService brokerService) throws Exception {
+        // nothing to do as kahaDB is now the default
+        //KahaDBPersistenceAdapter kahaDB = (KahaDBPersistenceAdapter) brokerService.getPersistenceAdapter();
+        //kahaDB.setConcurrentStoreAndDispatchTopics(true);
+    }
+}

activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java

@@ -105,7 +105,7 @@ public class AMQ2149Test extends TestCase {
         broker.start();
     }
     
-    protected void configurePersistenceAdapter(BrokerService brokerService) {
+    protected void configurePersistenceAdapter(BrokerService brokerService) throws Exception {
         AMQPersistenceAdapterFactory persistenceFactory = new AMQPersistenceAdapterFactory();
         persistenceFactory.setDataDirectory(dataDirFile);
         brokerService.setPersistenceFactory(persistenceFactory);