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 2009/12/24 01:41:00 UTC
svn commit: r893664 - in
/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc:
JDBCPersistenceAdapter.java adapter/DefaultJDBCAdapter.java
Author: gtully
Date: Thu Dec 24 00:41:00 2009
New Revision: 893664
URL: http://svn.apache.org/viewvc?rev=893664&view=rev
Log:
svn merge -c 893661 - last piece of https://issues.apache.org/activemq/browse/AMQ-2540 - fix order or audit recovery replay
Modified:
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java?rev=893664&r1=893663&r2=893664&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java Thu Dec 24 00:41:00 2009
@@ -519,7 +519,7 @@
e = e.getNextException();
s += ", due to: " + e.getMessage();
}
- LOG.debug(s, e);
+ LOG.warn(s, e);
}
public Statements getStatements() {
Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java?rev=893664&r1=893663&r2=893664&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java Thu Dec 24 00:41:00 2009
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -333,8 +334,13 @@
s = c.getConnection().prepareStatement(this.statements.getFindAllMessageIdsStatement());
s.setMaxRows(limit);
rs = s.executeQuery();
+ // jdbc scrollable cursor requires jdbc ver > 1.0 andis often implemented locally so avoid
+ LinkedList<MessageId> reverseOrderIds = new LinkedList<MessageId>();
while (rs.next()) {
- listener.messageId(new MessageId(rs.getString(2), rs.getLong(3)));
+ reverseOrderIds.addFirst(new MessageId(rs.getString(2), rs.getLong(3)));
+ }
+ for (MessageId id : reverseOrderIds) {
+ listener.messageId(id);
}
} finally {
close(rs);