You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/09/08 14:32:50 UTC
svn commit: r1623376 - in /qpid/branches/0.30/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
Author: rgodfrey
Date: Mon Sep 8 12:32:50 2014
New Revision: 1623376
URL: http://svn.apache.org/r1623376
Log:
QPID-6080 : Merged revision 1622968 from trunk to 0.30
Modified:
qpid/branches/0.30/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/branches/0.30/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
Modified: qpid/branches/0.30/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1623376&r1=1623375&r2=1623376&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/branches/0.30/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Mon Sep 8 12:32:50 2014
@@ -1330,7 +1330,7 @@ public abstract class AbstractBDBMessage
}
else
{
- data = new byte[0];
+ return null;
}
}
return ByteBuffer.wrap(data,offsetInMessage,Math.min(size,data.length-offsetInMessage));
Modified: qpid/branches/0.30/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1623376&r1=1623375&r2=1623376&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/branches/0.30/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Mon Sep 8 12:32:50 2014
@@ -1561,7 +1561,7 @@ public abstract class AbstractJDBCMessag
}
else
{
- data = new byte[0];
+ return null;
}
}
return ByteBuffer.wrap(data,offsetInMessage,Math.min(size,data.length-offsetInMessage));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org