Author: clebert.suconic(a)jboss.com Date: 2011-03-01 11:54:34 -0500 (Tue, 01 Mar 2011) New Revision: 10275 Modified: branches/Branch_2_2_EAP/build-maven.xml branches/Branch_2_2_EAP/hornetq-rest/pom.xml branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java Log: tweak on report used on investigation Modified: branches/Branch_2_2_EAP/build-maven.xml =================================================================== --- branches/Branch_2_2_EAP/build-maven.xml 2011-03-01 14:08:34 UTC (rev 10274) +++ branches/Branch_2_2_EAP/build-maven.xml 2011-03-01 16:54:34 UTC (rev 10275) @@ -13,7 +13,7 @@ --> <project default="upload" name="HornetQ"> - <property name="hornetq.version" value="2.2.0.GA"/> + <property name="hornetq.version" value="2.2.1.GA"/> <property name="build.dir" value="build"/> <property name="jars.dir" value="${build.dir}/jars"/> Modified: branches/Branch_2_2_EAP/hornetq-rest/pom.xml =================================================================== --- branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-03-01 14:08:34 UTC (rev 10274) +++ branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-03-01 16:54:34 UTC (rev 10275) @@ -10,7 +10,7 @@ <properties> <resteasy.version>2.0.1.GA</resteasy.version> - <hornetq.version>2.2.0.GA</hornetq.version> + <hornetq.version>2.2.1.GA</hornetq.version> </properties> <licenses> Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-03-01 14:08:34 UTC (rev 10274) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-03-01 16:54:34 UTC (rev 10275) @@ -3118,21 +3118,23 @@ List<PreparedTransactionInfo> preparedTransactions = new LinkedList<PreparedTransactionInfo>(); journal.start(); + + final StringBuffer bufferFailingTransactions = new StringBuffer(); journal.load(records, preparedTransactions, new TransactionFailureCallback() { public void failedTransaction(long transactionID, List<RecordInfo> records, List<RecordInfo> recordsToDelete) { - out.println("Transaction " + transactionID + " failed with these records:"); + bufferFailingTransactions.append("Transaction " + transactionID + " failed with these records:\n"); for (RecordInfo info : records) { - out.println("- " + describeRecord(info)); + bufferFailingTransactions.append("- " + describeRecord(info) + "\n"); } for (RecordInfo info : recordsToDelete) { - out.println("- " + describeRecord(info) + " <marked to delete>"); + bufferFailingTransactions.append("- " + describeRecord(info) + " <marked to delete>\n"); } } @@ -3140,9 +3142,10 @@ for (RecordInfo info : records) { - System.out.println(describeRecord(info)); + out.println(describeRecord(info)); } + out.println(); out.println("### Prepared TX ###"); for (PreparedTransactionInfo tx : preparedTransactions) @@ -3158,6 +3161,18 @@ out.println("- " + describeRecord(info) + " <marked to delete>"); } } + + String missingTX = bufferFailingTransactions.toString(); + + if (missingTX.length() > 0) + { + out.println(); + out.println("### Failed Transactions (Missing commit/prepare/rollback record) ###"); + } + + + out.println(bufferFailingTransactions.toString()); + journal.stop(); }