Skip to content
[Jenkins]Jenkins
log in
Success

Changes

Summary

  1. [20] Fix NPE with two objects with same id but different eClass (details)
  2. Bump version to 3.3.25 (details)
Commit 35e4b0cb9e6030c333c5bfdfe4ca4e8421a603b1 by Laurent Goubet
[20] Fix NPE with two objects with same id but different eClass

We handle the two ways and three ways comparisons.
We also check if the EObject is not a DynamicEObject: in this case, we
keep the previous behavior.

Bug: https://github.com/eclipse-emf-compare/emf-compare/issues/20
Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>
The file was modified plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featurefilter/featuremap/left.nodes (diff)
The file was modified plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/mergeviewer/item/MergeViewerItemFeatureMapsTest.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultMatchEngine.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/ReferenceUtil.java (diff)
The file was modified packaging/org.eclipse.emf.compare.egit-feature/feature.xml (diff)
The file was modified plugins/org.eclipse.emf.compare.doc/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.update/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.egit-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.gendoc/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui.e4-feature/pom.xml (diff)
The file was modified org.eclipse.emf.compare-parent/feature-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.uml2-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml (diff)
The file was modified org.eclipse.emf.compare-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.sirius-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.uml2-feature/pom.xml (diff)
The file was modified org.eclipse.emf.compare-parent/test-parent/pom.xml (diff)
The file was modified plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF (diff)
The file was modified org.eclipse.emf.compare-parent/bundle-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui.e4-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.sirius-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.update.extras/pom.xml (diff)