Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-12-22 09:26:09 +0000
committerEike Stepper2012-12-22 09:29:05 +0000
commit4a927c565b1c07168756a0a71ccf9723632258d5 (patch)
tree8d0d31d5cf18effaa90e5baaedea1398ec4021d7
parent1969aa875191a603e1b79fd3f9d6a7776af05ac3 (diff)
downloadcdo-drops/I20121228-0411.tar.gz
cdo-drops/I20121228-0411.tar.xz
cdo-drops/I20121228-0411.zip
[396804] CDOMergingConflictResolver tests drops/I20121228-0411
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index 68fb5bbc9c..85a76eb0e7 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -1591,6 +1591,10 @@ public class CDOViewImpl extends AbstractCDOView
doInvalidate(branch, lastUpdateTime, allChangedObjects, allDetachedObjects, oldRevisions,
clearResourcePathCache);
}
+ catch (Exception ex)
+ {
+ OM.LOG.error(ex);
+ }
finally
{
invalidationRunnerActive = false;

Back to the top