Author: rgemmell Date: 2010-06-25 07:59:53 -0400 (Fri, 25 Jun 2010) New Revision: 4051 Modified: store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java Log: Output correct count for the Content visitor, update language for results in general Modified: store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java =================================================================== --- store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2010-06-25 09:44:25 UTC (rev 4050) +++ store/trunk/java/bdbstore/src/tools/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java 2010-06-25 11:59:53 UTC (rev 4051) @@ -408,7 +408,7 @@ //Migrate _queueBindingsDb; - _logger.info("QueueBindings"); + _logger.info("Queue Bindings"); moveContents(_oldMessageStore.getBindingsDb(), _newMessageStore.getBindingsDb(), "Queue Binding"); //Inspect the bindings to gather a list of queues which are probably durable subscriptions, i.e. those @@ -537,12 +537,12 @@ }; _oldMessageStore.visitContentDb(contentVisitor); - logCount(metaDataVisitor.getVisitedCount(), "Message ContentChunk"); + logCount(contentVisitor.getVisitedCount(), "Message Content"); //Migrate _deliveryDb; _logger.info("Delivery Records"); - moveContents(_oldMessageStore.getDeliveryDb(), _newMessageStore.getDeliveryDb(), "Delivery Record"); + moveContents(_oldMessageStore.getDeliveryDb(), _newMessageStore.getDeliveryDb(), "Delivery"); } /** @@ -553,7 +553,7 @@ */ private void logCount(int count, String item) { - _logger.info(" " + count + " " + item + " " + (count == 1 ? "entry" : "entries")); + _logger.info(" " + count + " " + item + " " + (count == 1 ? "record" : "records")); } /**