diff options
| author | Eike Stepper | 2010-05-27 08:41:56 +0000 |
|---|---|---|
| committer | Eike Stepper | 2010-05-27 08:41:56 +0000 |
| commit | 1f77f45c4a5a68bdd7566e3a6dd950595431a4b0 (patch) | |
| tree | 53eeea69f4a1709f7e14e49778b566c8ac1e8c03 | |
| parent | 6196fdff23daacf90e014e40e5541a9f4f5fec7f (diff) | |
| download | cdo-1f77f45c4a5a68bdd7566e3a6dd950595431a4b0.tar.gz cdo-1f77f45c4a5a68bdd7566e3a6dd950595431a4b0.tar.xz cdo-1f77f45c4a5a68bdd7566e3a6dd950595431a4b0.zip | |
[314605] MergingTest fails occasionally on Hudson
https://bugs.eclipse.org/bugs/show_bug.cgi?id=314605
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java index d290e69080..e31b2a67f5 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java @@ -316,7 +316,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa throw new IllegalStateException("Merging into dirty transactions not yet supported"); } - long now = session.getRepositoryInfo().getTimeStamp(); + long now = getLastUpdateTime(); CDOBranchPoint target = getBranch().getPoint(now); CDOBranch sourceBranch = source.getBranch(); |