[hornetq-commits] JBoss hornetq SVN: r10445 - in trunk/src/main/org/hornetq/core: replication/impl and 1 other directories.
Author: clebert.suconic(a)jboss.com
Date: 2011-04-04 15:12:46 -0400 (Mon, 04 Apr 2011)
New Revision: 10445
Modified:
trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java
trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java
Log:
https://issues.jboss.org/browse/HORNETQ-664 - Async commit on Paging
Modified:
trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
---
trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-04-04
18:45:27 UTC (rev 10444)
+++
trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-04-04
19:12:46 UTC (rev 10445)
@@ -1430,7 +1430,17 @@
return bindingsInfo;
}
+
+ /* (non-Javadoc)
+ * @see org.hornetq.core.persistence.StorageManager#lineUpContext()
+ */
+ public void lineUpContext()
+ {
+ messageJournal.lineUpContex(getContext());
+ }
+
+
// HornetQComponent implementation
// ------------------------------------------------------
@@ -3301,11 +3311,4 @@
journal.stop();
}
- /* (non-Javadoc)
- * @see org.hornetq.core.persistence.StorageManager#lineUpContext()
- */
- public void lineUpContext()
- {
- }
-
}
Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java
===================================================================
--- trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java 2011-04-04
18:45:27 UTC (rev 10444)
+++ trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java 2011-04-04
19:12:46 UTC (rev 10445)
@@ -25,6 +25,7 @@
import org.hornetq.core.journal.TransactionFailureCallback;
import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding;
import org.hornetq.core.logging.Logger;
+import org.hornetq.core.persistence.OperationContext;
import org.hornetq.core.persistence.impl.journal.JournalStorageManager;
import org.hornetq.core.replication.ReplicationManager;
@@ -564,6 +565,7 @@
*/
public void lineUpContex(IOCompletion callback)
{
+ ((OperationContext)callback).replicationLineUp();
localJournal.lineUpContex(callback);
}
Modified: trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2011-04-04
18:45:27 UTC (rev 10444)
+++ trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2011-04-04
19:12:46 UTC (rev 10445)
@@ -331,7 +331,7 @@
}
}
});
- ctx.storeLineUp();
+ storageManager.lineUpContext();
}
public void rollback() throws Exception