Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-12-13 16:29:44 -0500
committerEike Stepper2008-12-13 16:29:44 -0500
commit9f42414414409ee0af9b16b53d63255f2c7a2a51 (patch)
tree53577f51a7680a68e18798ef06240133f8a9db65 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util
parent6b56bd26a06e71265f8e8434981c5f31f13e05e6 (diff)
downloadcdo-9f42414414409ee0af9b16b53d63255f2c7a2a51.tar.gz
cdo-9f42414414409ee0af9b16b53d63255f2c7a2a51.tar.xz
cdo-9f42414414409ee0af9b16b53d63255f2c7a2a51.zip
[257372] Handle conflict object without rollback the view completely
https://bugs.eclipse.org/bugs/show_bug.cgi?id=257372
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index c51d3df97e..1e30fb82e4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -57,6 +57,12 @@ public final class FSMUtil
return state == CDOState.INVALID || state == CDOState.INVALID_CONFLICT;
}
+ public static boolean isConflict(CDOObject object)
+ {
+ CDOState state = object.cdoState();
+ return state == CDOState.CONFLICT || state == CDOState.INVALID_CONFLICT;
+ }
+
public static boolean isNew(CDOObject object)
{
CDOState state = object.cdoState();

Back to the top