svn commit: r906560 - in /activemq/trunk/activemq-core: ./ src/main/java/org/apache/activemq/broker/region/cursors/ src/main/java/org/apache/activemq/store/jdbc/

[dejanb]

Author: dejanb
Date: Thu Feb  4 16:46:51 2010
New Revision: 906560

URL: http://svn.apache.org/viewvc?rev=906560&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2594 - reverting related 
https://issues.apache.org/activemq/browse/AMQ-2563 changes, as more refactoring 
is needed

Modified:
    activemq/trunk/activemq-core/pom.xml
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java

Modified: activemq/trunk/activemq-core/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=906560&r1=906559&r2=906560&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Thu Feb  4 16:46:51 2010
@@ -500,6 +500,8 @@
              
              <!-- used just to test potential memory leaks manually -->
              <exclude>**/JDBCTestMemory.*</exclude>
+             <!--  exclude until AMQ-2594 is fixed-->
+             <exclude>JDBCNegativeQueueTest</exclude>
              
              <exclude>**/amq1490/*</exclude>
              <exclude>**/AMQ1925*</exclude>

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java?rev=906560&r1=906559&r2=906560&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
 Thu Feb  4 16:46:51 2010
@@ -86,9 +86,7 @@
             clearIterator(true);
             recovered = true;
         } else {
-            if (LOG.isDebugEnabled()) {
-                
LOG.debug(regionDestination.getActiveMQDestination().getPhysicalName() + " 
cursor got duplicate: " + message);
-            }
+            
LOG.error(regionDestination.getActiveMQDestination().getPhysicalName() + " 
cursor got duplicate: " + message);
             storeHasMessages = true;
         }
         return recovered;
@@ -162,10 +160,6 @@
             recoverMessage(node.getMessage(),true);
             lastCachedId = node.getMessageId();
         } else {
-            if (lastCachedId != null && 
node.getMessageId().getBrokerSequenceId() < lastCachedId.getBrokerSequenceId()) 
{
-                lastCachedId = node.getMessageId();
-                setBatch(lastCachedId);
-            }
             if (cacheEnabled) {
                 cacheEnabled=false;
                 if (LOG.isDebugEnabled()) {

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java?rev=906560&r1=906559&r2=906560&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
 Thu Feb  4 16:46:51 2010
@@ -231,9 +231,8 @@
                     if (listener.hasSpace()) {
                         Message msg = (Message)wireFormat.unmarshal(new 
ByteSequence(data));
                         msg.getMessageId().setBrokerSequenceId(sequenceId);
-                        if (listener.recoverMessage(msg)) {
-                            lastMessageId.set(sequenceId);
-                        }
+                        listener.recoverMessage(msg);
+                        lastMessageId.set(sequenceId);
                         return true;
                     }
                     return false;

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java?rev=906560&r1=906559&r2=906560&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/Statements.java
 Thu Feb  4 16:46:51 2010
@@ -345,7 +345,7 @@
     public String getFindNextMessagesStatement() {
         if (findNextMessagesStatement == null) {
             findNextMessagesStatement = "SELECT ID, MSG FROM " + 
getFullMessageTableName()
-                                        + " WHERE CONTAINER=? AND ID >= ? 
ORDER BY ID";
+                                        + " WHERE CONTAINER=? AND ID > ? ORDER 
BY ID";
         }
         return findNextMessagesStatement;
     }