Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'extraplugins/uml')
-rw-r--r--extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java b/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java
index d72c9298440..3105d2fd810 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.infra.emf.compare.diff/src/org/eclipse/papyrus/infra/emf/compare/diff/internal/util/PapyrusCompareEObjectCopier.java
@@ -136,7 +136,7 @@ public class PapyrusCompareEObjectCopier extends EMFCompareEObjectCopier {
copyResource.setID(copy, originResource.getID(original));
final TreeIterator<EObject> originalIterator = original.eAllContents();
final TreeIterator<EObject> copyIterator = copy.eAllContents();
- while(originalIterator.hasNext()) {
+ while(originalIterator.hasNext() && copyIterator.hasNext()) {
final EObject nextOriginalChild = originalIterator.next();
final EObject nextCopyChild = copyIterator.next();
if(nextOriginalChild.eResource() == nextCopyChild.eResource()) {

Back to the top