From 7cd2a924fba6b0eb78c1c7487e647f5d298a280e Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Wed, 22 Jan 2014 17:16:44 +0000 Subject: QPID-5504 : initial refactoring to move common code into shared classes, make transports work similarly with respect to message routing git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560424 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java | 3 +-- .../apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'qpid/java/bdbstore') diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java index 4c9eae6f3e..9d52241c4c 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java @@ -663,9 +663,8 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade { final MessagePublishInfo publishBody = readMessagePublishInfo(input); final ContentHeaderBody contentHeaderBody = readContentHeaderBody(input); - final int contentChunkCount = input.readInt(); - return new MessageMetaData(publishBody, contentHeaderBody, contentChunkCount); + return new MessageMetaData(publishBody, contentHeaderBody); } catch (Exception e) { diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java index 76b990038d..3d6821ad47 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java +++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java @@ -94,7 +94,7 @@ public class BDBMessageStoreTest extends MessageStoreTest ContentHeaderBody chb_0_8 = createContentHeaderBody_0_8(props_0_8, bodySize); - MessageMetaData messageMetaData_0_8 = new MessageMetaData(pubInfoBody_0_8, chb_0_8, 0); + MessageMetaData messageMetaData_0_8 = new MessageMetaData(pubInfoBody_0_8, chb_0_8); StoredMessage storedMessage_0_8 = bdbStore.addMessage(messageMetaData_0_8); long origArrivalTime_0_8 = messageMetaData_0_8.getArrivalTime(); @@ -150,7 +150,7 @@ public class BDBMessageStoreTest extends MessageStoreTest assertEquals("ContentHeader weight has changed", chb_0_8.getWeight(), returnedHeaderBody_0_8.getWeight()); assertEquals("ContentHeader bodySize has changed", chb_0_8.getBodySize(), returnedHeaderBody_0_8.getBodySize()); - BasicContentHeaderProperties returnedProperties_0_8 = (BasicContentHeaderProperties) returnedHeaderBody_0_8.getProperties(); + BasicContentHeaderProperties returnedProperties_0_8 = returnedHeaderBody_0_8.getProperties(); assertEquals("Property ContentType has changed", props_0_8.getContentTypeAsString(), returnedProperties_0_8.getContentTypeAsString()); assertEquals("Property MessageID has changed", props_0_8.getMessageIdAsString(), returnedProperties_0_8.getMessageIdAsString()); @@ -392,7 +392,7 @@ public class BDBMessageStoreTest extends MessageStoreTest ContentHeaderBody chb_0_8 = createContentHeaderBody_0_8(props_0_8, bodySize); - MessageMetaData messageMetaData_0_8 = new MessageMetaData(pubInfoBody_0_8, chb_0_8, 0); + MessageMetaData messageMetaData_0_8 = new MessageMetaData(pubInfoBody_0_8, chb_0_8); StoredMessage storedMessage_0_8 = store.addMessage(messageMetaData_0_8); storedMessage_0_8.addContent(0, chunk1); -- cgit v1.2.1