[hornetq-commits] JBoss hornetq SVN: r12109 - trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal.

[do-not-reply at jboss.org]

Author: jbertram
Date: 2012-02-13 10:34:49 -0500 (Mon, 13 Feb 2012)
New Revision: 12109

Modified:
   trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
Log:
[HORNETQ-847] createQueue not idempotent

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2012-02-10 18:51:28 UTC (rev 12108)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java	2012-02-13 15:34:49 UTC (rev 12109)
@@ -1923,24 +1923,17 @@
                                                                                           binding.getAddress(),
                                                                                           filterString);
 
-<<<<<<< .working
         readLock();
       try
           {
-              bindingsJournal.appendAddRecord(binding.getID(),
-                                              JournalStorageManager.QUEUE_BINDING_RECORD,
-                                              bindingEncoding,
-                                              true);
+              bindingsJournal.appendAddRecordTransactional(tx, binding.getID(),
+	                                      JournalStorageManager.QUEUE_BINDING_RECORD,
+	                                      bindingEncoding);
           }
       finally
           {
               readUnLock();
           }
-=======
-      bindingsJournal.appendAddRecordTransactional(tx, binding.getID(),
-                                      JournalStorageManager.QUEUE_BINDING_RECORD,
-                                      bindingEncoding);
->>>>>>> .merge-right.r12106
    }
 
    public void deleteQueueBinding(final long queueBindingID) throws Exception