Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-04-02 03:47:35 -0400
committerlgoubet2019-04-03 04:05:23 -0400
commitbb60b171028e0d7bc30a4bd11fd7401e1b9d88bb (patch)
treee1d386ef75d234fec3dcb3f3b4459198f7364129
parent494572716c1daa07a97817e2e77bdef92df38ad7 (diff)
downloadorg.eclipse.emf.compare-bb60b171028e0d7bc30a4bd11fd7401e1b9d88bb.tar.gz
org.eclipse.emf.compare-bb60b171028e0d7bc30a4bd11fd7401e1b9d88bb.tar.xz
org.eclipse.emf.compare-bb60b171028e0d7bc30a4bd11fd7401e1b9d88bb.zip
Restore possibility to remove mergers from the registry
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
index 1bb2d7f76..6166e1397 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
@@ -149,7 +149,7 @@ public abstract class AbstractMerger implements IMerger2, IMergeOptionAware, IMe
if (this.registry != null && registry != null) {
throw new IllegalStateException("The registry has to be set only once."); //$NON-NLS-1$
}
- if (!(registry instanceof Registry2)) {
+ if (registry != null && !(registry instanceof Registry2)) {
throw new IllegalArgumentException("The registry must implement Registry2"); //$NON-NLS-1$
}
this.registry = (Registry2)registry;

Back to the top