From 1159ea60e35569629c1aefa4850c17e8f22ad3a6 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 12 May 2013 09:58:54 +0000 Subject: QPID-4832 : Exclude the default exchange in the bdb store upgrade from 5 to 6 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1481508 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java index 2b7c782ad1..464608ff59 100644 --- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java +++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java @@ -487,7 +487,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade { ExchangeRecord exchangeRecord = exchangeBinding.entryToObject(value); String exchangeName = exchangeRecord.getNameShortString().asString(); - if (!DEFAULT_EXCHANGES_SET.contains(exchangeName)) + if (!DEFAULT_EXCHANGES_SET.contains(exchangeName) && !"<>".equals(exchangeName)) { String exchangeType = exchangeRecord.getType().asString(); boolean autoDelete = exchangeRecord.isAutoDelete(); @@ -1239,4 +1239,4 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade } } } -} \ No newline at end of file +} -- cgit v1.2.1