Author: jbertram Date: 2012-02-09 17:15:24 -0500 (Thu, 09 Feb 2012) New Revision: 12101 Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java Log: [HORNETQ-847] createQueue not idempotent Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- branches/Branch_2_2_AS7/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2012-02-09 22:15:02 UTC (rev 12100) +++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2012-02-09 22:15:24 UTC (rev 12101) @@ -758,6 +758,17 @@ commit(txID, true); } + public void commitBindings(final long txID) throws Exception + { + bindingsJournal.appendCommitRecord(txID, true); + } + + public void rollbackBindings(final long txID) throws Exception + { + // no need to sync, it's going away anyways + bindingsJournal.appendRollbackRecord(txID, false); + } + public void commit(final long txID, final boolean lineUpContext) throws Exception { messageJournal.appendCommitRecord(txID, syncTransactional, getContext(syncTransactional), lineUpContext); @@ -1371,7 +1382,7 @@ // Bindings operations - public void addQueueBinding(final Binding binding) throws Exception + public void addQueueBinding(final long tx, final Binding binding) throws Exception { Queue queue = (Queue)binding.getBindable(); @@ -1383,10 +1394,9 @@ binding.getAddress(), filterString); - bindingsJournal.appendAddRecord(binding.getID(), + bindingsJournal.appendAddRecordTransactional(tx, binding.getID(), JournalStorageManager.QUEUE_BINDING_RECORD, - bindingEncoding, - true); + bindingEncoding); } public void deleteQueueBinding(final long queueBindingID) throws Exception