make sure next entry will be set properly in recovery

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

activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java

@@ -36,9 +36,9 @@ public class KahaMessageStore implements MessageStore{
     protected final ActiveMQDestination destination;
     protected final MapContainer<MessageId,Message> messageContainer;
     protected StoreEntry batchEntry=null;
-    
 
-    public KahaMessageStore(MapContainer<MessageId,Message> container,ActiveMQDestination destination) throws IOException{
+    public KahaMessageStore(MapContainer<MessageId,Message> container,ActiveMQDestination destination)
+            throws IOException{
         this.messageContainer=container;
         this.destination=destination;
     }
@@ -110,7 +110,7 @@ public class KahaMessageStore implements MessageStore{
     /**
      * @param usageManager The UsageManager that is controlling the destination's memory usage.
      */
-    public void setUsageManager(UsageManager usageManager) {
+    public void setUsageManager(UsageManager usageManager){
     }
 
     /**
@@ -146,6 +146,9 @@ public class KahaMessageStore implements MessageStore{
         }else{
             entry=messageContainer.refresh(entry);
             entry=messageContainer.getNext(entry);
+            if(entry==null){
+                batchEntry=null;
+            }
         }
         if(entry!=null){
             int count=0;
@@ -176,6 +179,4 @@ public class KahaMessageStore implements MessageStore{
     public boolean isSupportForCursors(){
         return true;
     }
-
-    
 }

activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java

@@ -1,20 +1,17 @@
 /**
- *
+ * 
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
- * contributor license agreements.  See the NOTICE file distributed with
+ * file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
- * this work for additional information regarding copyright ownership.
+ * to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * License. You may obtain a copy of the License at
- * (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
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * specific language governing permissions and limitations under the License.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
+
 package org.apache.activemq.store.kahadaptor;
 
 import java.io.IOException;
@@ -30,46 +27,40 @@ import org.apache.activemq.memory.UsageManager;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.ReferenceStore;
 
-public class KahaReferenceStore implements ReferenceStore {
+public class KahaReferenceStore implements ReferenceStore{
 
     protected final ActiveMQDestination destination;
     protected final MapContainer<MessageId,ReferenceRecord> messageContainer;
     protected StoreEntry batchEntry=null;
-	
 
-	public KahaReferenceStore(MapContainer container, ActiveMQDestination destination) throws IOException {
+    public KahaReferenceStore(MapContainer container,ActiveMQDestination destination) throws IOException{
         this.messageContainer=container;
         this.destination=destination;
-		
+    }
-	}
+
-    
     public void start(){
     }
 
     public void stop(){
     }
 
-	
+    protected MessageId getMessageId(Object object){
-	protected MessageId getMessageId(Object object) {
+        return new MessageId(((ReferenceRecord)object).messageId);
-		return new MessageId(((ReferenceRecord)object).messageId);
+    }
-	}
+
+    public synchronized void addMessage(ConnectionContext context,Message message) throws IOException{
+        throw new RuntimeException("Use addMessageReference instead");
+    }
+
+    public synchronized Message getMessage(MessageId identity) throws IOException{
+        throw new RuntimeException("Use addMessageReference instead");
+    }
+
+    protected void recover(MessageRecoveryListener listener,Object msg) throws Exception{
+        ReferenceRecord record=(ReferenceRecord)msg;
+        listener.recoverMessageReference(new MessageId(record.messageId));
+    }
 
-	
-	public synchronized void addMessage(ConnectionContext context, Message message) throws IOException {
-		throw new RuntimeException("Use addMessageReference instead");
-	}
-	
-	
-	public synchronized Message getMessage(MessageId identity) throws IOException {
-		throw new RuntimeException("Use addMessageReference instead");
-	}
-	
-	
-	protected void recover(MessageRecoveryListener listener, Object msg) throws Exception {
-		ReferenceRecord record = (ReferenceRecord) msg;
-		listener.recoverMessageReference(new MessageId(record.messageId));
-	}
-    
     public synchronized void recover(MessageRecoveryListener listener) throws Exception{
         for(StoreEntry entry=messageContainer.getFirst();entry!=null;entry=messageContainer.getNext(entry)){
             ReferenceRecord record=messageContainer.getValue(entry);
@@ -77,7 +68,7 @@ public class KahaReferenceStore implements ReferenceStore {
         }
         listener.finished();
     }
-    
+
     public synchronized void recoverNextMessages(int maxReturned,MessageRecoveryListener listener) throws Exception{
         StoreEntry entry=batchEntry;
         if(entry==null){
@@ -85,6 +76,9 @@ public class KahaReferenceStore implements ReferenceStore {
         }else{
             entry=messageContainer.refresh(entry);
             entry=messageContainer.getNext(entry);
+            if (entry==null) {
+                batchEntry=null;
+            }
         }
         if(entry!=null){
             int count=0;
@@ -100,38 +94,38 @@ public class KahaReferenceStore implements ReferenceStore {
         }
         listener.finished();
     }
-	
+
-	public void addMessageReference(ConnectionContext context, MessageId messageId, ReferenceData data) throws IOException {
+    public void addMessageReference(ConnectionContext context,MessageId messageId,ReferenceData data)
-		ReferenceRecord record = new ReferenceRecord(messageId.toString(), data);
+            throws IOException{
+        ReferenceRecord record=new ReferenceRecord(messageId.toString(),data);
         messageContainer.put(messageId,record);
-	}
+    }
 
-	public ReferenceData getMessageReference(MessageId identity) throws IOException {
+    public ReferenceData getMessageReference(MessageId identity) throws IOException{
-		
+        ReferenceRecord result=messageContainer.get(identity);
-		ReferenceRecord result=messageContainer.get(identity);
+        if(result==null)
-        if( result == null )
+            return null;
-        	return null;
         return result.data;
-	}
+    }
 
-	public void addReferenceFileIdsInUse(Set<Integer> rc) {
+    public void addReferenceFileIdsInUse(Set<Integer> rc){
-        for (StoreEntry entry = messageContainer.getFirst();entry != null; entry = messageContainer.getNext(entry)) {
+        for(StoreEntry entry=messageContainer.getFirst();entry!=null;entry=messageContainer.getNext(entry)){
-        	ReferenceRecord msg=(ReferenceRecord)messageContainer.get(entry);
+            ReferenceRecord msg=(ReferenceRecord)messageContainer.get(entry);
             rc.add(msg.data.getFileId());
         }
-	}
+    }
-    
+
     public void removeMessage(ConnectionContext context,MessageAck ack) throws IOException{
         removeMessage(ack.getLastMessageId());
     }
-    
+
     public synchronized void removeMessage(MessageId msgId) throws IOException{
         messageContainer.remove(msgId);
         if(messageContainer.isEmpty()){
             resetBatching();
         }
     }
-    
+
     public synchronized void removeAllMessages(ConnectionContext context) throws IOException{
         messageContainer.clear();
     }
@@ -143,21 +137,19 @@ public class KahaReferenceStore implements ReferenceStore {
     public synchronized void delete(){
         messageContainer.clear();
     }
-    
+
     public void resetBatching(){
         batchEntry=null;
     }
-    
+
     public int getMessageCount(){
         return messageContainer.size();
     }
-    
+
-    public void setUsageManager(UsageManager usageManager) {
+    public void setUsageManager(UsageManager usageManager){
     }
-    
+
     public boolean isSupportForCursors(){
         return true;
     }
-
-
 }