svn commit: r651276 - /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java

[rhs]

Author: rhs
Date: Thu Apr 24 07:35:01 2008
New Revision: 651276

URL: http://svn.apache.org/viewvc?rev=651276&view=rev
Log:
QPID-832: fixed DerbyMessageStore to compile on Java 1.5 (hopefully)

Modified:
    
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java

Modified: 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=651276&r1=651275&r2=651276&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
 Thu Apr 24 07:35:01 2008
@@ -638,8 +638,9 @@
                     blobArgs.setBytes(0, args.getDataAsBytes());
                     stmt.setBlob(4, blobArgs);
                     */
-                    ByteArrayInputStream bis = new 
ByteArrayInputStream(args.getDataAsBytes());
-                    stmt.setBinaryStream(4, bis);
+                    byte[] bytes = args.getDataAsBytes();
+                    ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
+                    stmt.setBinaryStream(4, bis, bytes.length);
                 }
                 else
                 {
@@ -1043,7 +1044,7 @@
             stmt.setBlob(3, dataAsBlob);
             */
             ByteArrayInputStream bis = new ByteArrayInputStream(chunkData);
-            stmt.setBinaryStream(3, bis);
+            stmt.setBinaryStream(3, bis, chunkData.length);
             stmt.executeUpdate();
             connWrapper.requiresCommit();
 
@@ -1093,7 +1094,7 @@
             stmt.setBlob(6, dataAsBlob);
 */
             ByteArrayInputStream bis = new ByteArrayInputStream(underlying);
-            stmt.setBinaryStream(6,bis);
+            stmt.setBinaryStream(6,bis,underlying.length);
 
             stmt.setInt(7, mmd.getContentChunkCount());