Author: borges Date: 2011-08-09 09:39:34 -0400 (Tue, 09 Aug 2011) New Revision: 11167 Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java Log: HORNETQ-720 Only change the replicator value once we have the lock. Modified: branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-08-09 13:38:59 UTC (rev 11166) +++ branches/HORNETQ-720_Replication/hornetq-core/src/main/java/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-08-09 13:39:34 UTC (rev 11167) @@ -358,7 +358,6 @@ throw new IllegalStateException("JournalStorageManager must be started..."); } assert replicationManager != null; - replicator = replicationManager; if (!(messageJournal instanceof JournalImpl) || !(bindingsJournal instanceof JournalImpl)) { @@ -380,6 +379,7 @@ storageManagerLock.writeLock().lock(); try { + replicator = replicationManager; localMessageJournal.writeLock(); localBindingsJournal.writeLock();