Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-01-12 05:55:32 -0500
committerEike Stepper2013-01-12 05:55:32 -0500
commit83e3182e508795caa735397d40a4fc9dc078e4df (patch)
tree5d8a162ff9e9354381dd3d2e7c4805b28c1d297e
parentaec93bc4f94db091be2c79518f1421d23cefd1aa (diff)
downloadcdo-83e3182e508795caa735397d40a4fc9dc078e4df.tar.gz
cdo-83e3182e508795caa735397d40a4fc9dc078e4df.tar.xz
cdo-83e3182e508795caa735397d40a4fc9dc078e4df.zip
Add missing "!" operator in merge()
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index a2a8327312..852c54e408 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -464,7 +464,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
throw new IllegalArgumentException("Source is already contained in " + target);
}
- if (sourceBase != null && CDOBranchUtil.isContainedBy(sourceBase, source))
+ if (sourceBase != null && !CDOBranchUtil.isContainedBy(sourceBase, source))
{
throw new IllegalArgumentException("Source base is not contained in " + source);
}

Back to the top