svn commit: r411878 - in /incubator/activemq/branches/activemq-4.0/activemq-core/src: main/java/org/apache/activemq/store/jdbc/adapter/ main/java/org/apache/activemq/store/journal/ test/java/org/apache/activemq/bugs/

[jstrachan]

Author: jstrachan
Date: Mon Jun  5 11:03:29 2006
New Revision: 411878

URL: http://svn.apache.org/viewvc?rev=411878&view=rev
Log:
backported fixes to 4.0.1

Added:
    
incubator/activemq/branches/activemq-4.0/activemq-core/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
      - copied unchanged from r411733, 
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
Modified:
    
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
    
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java

Modified: 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java?rev=411878&r1=411877&r2=411878&view=diff
==============================================================================
--- 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
 (original)
+++ 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
 Mon Jun  5 11:03:29 2006
@@ -52,6 +52,9 @@
     protected byte[] getBinaryData(ResultSet rs, int index) throws 
SQLException {
         // Get as a BLOB
         Blob aBlob = rs.getBlob(index);
+        if (aBlob == null) {
+            return null;
+        }
         return aBlob.getBytes(1, (int) aBlob.length());
     }
 }

Modified: 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java?rev=411878&r1=411877&r2=411878&view=diff
==============================================================================
--- 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
 (original)
+++ 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java
 Mon Jun  5 11:03:29 2006
@@ -263,7 +263,6 @@
                     
                     size += message.getSize();
                     
-                    iterator.remove();
                     message.decrementReferenceCount();
                     
                     // Commit the batch if it's getting too big