Author: rgodfrey
Date: Sun May 12 09:58:54 2013
New Revision: 1481508
URL: http://svn.apache.org/r1481508
Log:
QPID-4832 : Exclude the default exchange in the bdb store upgrade from 5 to 6
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java?rev=1481508&r1=1481507&r2=1481508&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
Sun May 12 09:58:54 2013
@@ -487,7 +487,7 @@ public class UpgradeFrom5To6 extends Abs
{
ExchangeRecord exchangeRecord =
exchangeBinding.entryToObject(value);
String exchangeName =
exchangeRecord.getNameShortString().asString();
- if (!DEFAULT_EXCHANGES_SET.contains(exchangeName))
+ if (!DEFAULT_EXCHANGES_SET.contains(exchangeName) &&
!"<<default>>".equals(exchangeName))
{
String exchangeType =
exchangeRecord.getType().asString();
boolean autoDelete = exchangeRecord.isAutoDelete();
@@ -1239,4 +1239,4 @@ public class UpgradeFrom5To6 extends Abs
}
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
