diff options
| author | Laurent Goubet | 2013-05-28 11:50:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-05-28 11:50:15 +0000 |
| commit | d96827d66df2a7bf73e2fa74aa3d16cf5d2560d1 (patch) | |
| tree | f0956467a9a8c81d3931dcceaa9fa2ed299c583e | |
| parent | c7a8b4311005713ce9ef10c779423214665fc2d6 (diff) | |
| parent | a0ee2b425ef1ec5793d63c8c1cee2fcf02773a76 (diff) | |
| download | org.eclipse.emf.compare-d96827d66df2a7bf73e2fa74aa3d16cf5d2560d1.tar.gz org.eclipse.emf.compare-d96827d66df2a7bf73e2fa74aa3d16cf5d2560d1.tar.xz org.eclipse.emf.compare-d96827d66df2a7bf73e2fa74aa3d16cf5d2560d1.zip | |
Merge "Avoid a few getMatch() calls" into 2.1
| -rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java index 3ba89e85e..2d3a18904 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java @@ -502,9 +502,9 @@ public class EditionDistance implements DistanceFunction { * we consider two null containers as being the "same".
*/
boolean matching = aContainer == null && bContainer == null;
- Match mA = inProgress.getMatch(aContainer);
- Match mB = inProgress.getMatch(bContainer);
if (!matching) {
+ Match mA = inProgress.getMatch(aContainer);
+ Match mB = inProgress.getMatch(bContainer);
if (mA == null && mB == null) {
/*
* The Objects have to be out of scope then.
|