Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-06-11 11:55:11 -0400
committerEike Stepper2013-06-11 11:55:11 -0400
commitcce7a107f84c472784ce7da638a559f1e70d41ee (patch)
tree6de8bac92a0b3245040beca1bb8e1486cdbe3403
parentbcee5b5481be52f6329d630585c0d9d869f2d424 (diff)
downloadcdo-cce7a107f84c472784ce7da638a559f1e70d41ee.tar.gz
cdo-cce7a107f84c472784ce7da638a559f1e70d41ee.tar.xz
cdo-cce7a107f84c472784ce7da638a559f1e70d41ee.zip
[409062] ObjectNotFoundException.branchPoint might not serialize
properly https://bugs.eclipse.org/bugs/show_bug.cgi?id=409062
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java
index 02afaf6ca5..015e2329fa 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/ObjectNotFoundException.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.util.CDOCommonUtil;
import org.eclipse.emf.cdo.common.util.CDOException;
+import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
import org.eclipse.emf.internal.cdo.messages.Messages;
@@ -22,7 +23,7 @@ import java.text.MessageFormat;
/**
* Exception occurs when an id doesn't exist on the server.
- *
+ *
* @author Simon McDuff
* @since 2.0
* @noextend This interface is not intended to be extended by clients.
@@ -50,7 +51,7 @@ public class ObjectNotFoundException extends CDOException
super(MessageFormat.format(Messages.getString("ObjectNotFoundException.1"), //$NON-NLS-1$
id, branchPoint.getBranch().getID(), CDOCommonUtil.formatTimeStamp(branchPoint.getTimeStamp())));
this.id = id;
- this.branchPoint = branchPoint;
+ this.branchPoint = CDOBranchUtil.copyBranchPoint(branchPoint);
}
/**

Back to the top