Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-01-25 10:50:37 +0000
committerEike Stepper2011-01-25 10:50:37 +0000
commit5455b64cf05c930aa50cc3d79f30d104d2c90203 (patch)
tree69448003b81526029d5dea71ed4a1c4b9e606ff4 /plugins/org.eclipse.emf.cdo.server.net4j/src
parent97f492090cae5e000c9ae1b5f66017c8295c9acc (diff)
downloadcdo-5455b64cf05c930aa50cc3d79f30d104d2c90203.tar.gz
cdo-5455b64cf05c930aa50cc3d79f30d104d2c90203.tar.xz
cdo-5455b64cf05c930aa50cc3d79f30d104d2c90203.zip
[329254] LastCommitTimeStamp updated even when a serverSide Error occurred
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329254
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.net4j/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
index 84dec48576..7aa169ab3e 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
@@ -272,6 +272,8 @@ public class CommitTransactionIndication extends CDOServerIndicationWithMonitori
if (!success)
{
out.writeString(rollbackMessage);
+ out.writeCDOBranchPoint(commitContext.getBranchPoint());
+ out.writeLong(commitContext.getPreviousTimeStamp());
if (xRefs != null)
{

Back to the top