Fix for issue #843

tsantalis · Jan 5, 2025 · ff44382 · ff44382
1 parent 70a4210
commit ff44382
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java
@@ -3062,7 +3062,7 @@ else if(candidate.getOriginalVariableDeclaration() != null) {
 						else {
 							originalClassDiff = getUMLClassDiff(candidate.getOperationBefore().getClassName());
 						}
-						if(diffs1.size() > 1) {
+						if(diffs1.size() > 1 && originalClassDiff != null) {
 							for(UMLClassBaseDiff classDiff : diffs1) {
 								if(isSubclassOf(originalClassDiff.nextClass.getName(), classDiff.nextClass.getName())) {
 									diff1 = classDiff;
@@ -3099,7 +3099,7 @@ else if(!diffs2.isEmpty()) {
 						else {
 							originalClassDiff = getUMLClassDiff(candidate.getOperationBefore().getClassName());
 						}
-						if(diffs2.size() > 1) {
+						if(diffs2.size() > 1 && originalClassDiff != null) {
 							for(UMLClassBaseDiff classDiff : diffs2) {
 								if(isSubclassOf(originalClassDiff.nextClass.getName(), classDiff.nextClass.getName())) {
 									diff2 = classDiff;