Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-06-13 05:56:48 +0000
committerEike Stepper2010-06-13 05:56:48 +0000
commit24b69d6c0f81543447c18f2de918d921c713fcb7 (patch)
tree1f0953f9ae6a0294615043f960c79e8c46fcdb66
parentef1647b4ba07e0530534f488c51dc29151403872 (diff)
downloadcdo-24b69d6c0f81543447c18f2de918d921c713fcb7.tar.gz
cdo-24b69d6c0f81543447c18f2de918d921c713fcb7.tar.xz
cdo-24b69d6c0f81543447c18f2de918d921c713fcb7.zip
[312632] Local repository was not gracefully shut down
https://bugs.eclipse.org/bugs/show_bug.cgi?id=312632
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java6
2 files changed, 7 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java
index c7a54d80f4..e34717d05f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/FailoverParticipant.java
@@ -43,8 +43,7 @@ public class FailoverParticipant extends SynchronizableRepository
else
{
// Bug 312879
- setLastReplicatedBranchID(getStore().getLastBranchID());
- setLastReplicatedCommitTime(getLastCommitTimeStamp());
+ setReplicationCountersToLatest();
// Switch on synchronizer
doStartSynchronization();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
index ca3a947dd3..feb6acb30b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
@@ -300,6 +300,12 @@ public abstract class SynchronizableRepository extends Repository.Default implem
}
}
+ protected void setReplicationCountersToLatest()
+ {
+ setLastReplicatedBranchID(getStore().getLastBranchID());
+ setLastReplicatedCommitTime(getLastCommitTimeStamp());
+ }
+
protected void doInitRootResource()
{
super.initRootResource();

Back to the top