Fix for issue #849

tsantalis · tsantalis · commit da6f7c94fd01 · 2025-01-10T12:18:48.000-05:00
diff --git a/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java b/src/main/java/gr/uom/java/xmi/decomposition/UMLOperationBodyMapper.java
@@ -8301,7 +8301,9 @@ else if(isIfBranch(grandParent, grandParent.getParent()) && !hasElseBranch(grand
 						while(parent != null && parent.getLocationInfo().getCodeElementType().equals(CodeElementType.BLOCK)) { 
 							parent = parent.getParent(); 
 						}
-						grandParents.add(parent);
+						if(parent != null) {
+							grandParents.add(parent);
+						}
 					}
 					if(container1.getBody() != null && grandParents.size() == 1) {
 						CompositeStatementObject grandParent2 = grandParents.iterator().next();

Original file line number	Diff line number	Diff line change
`@@ -8301,7 +8301,9 @@ else if(isIfBranch(grandParent, grandParent.getParent()) && !hasElseBranch(grand`
`8301`	`8301`	`while(parent != null && parent.getLocationInfo().getCodeElementType().equals(CodeElementType.BLOCK)) {`
`8302`	`8302`	`parent = parent.getParent();`
`8303`	`8303`	`}`
`8304`		`- grandParents.add(parent);`
	`8304`	`+ if(parent != null) {`
	`8305`	`+ grandParents.add(parent);`
	`8306`	`+ }`
`8305`	`8307`	`}`
`8306`	`8308`	`if(container1.getBody() != null && grandParents.size() == 1) {`
`8307`	`8309`	`CompositeStatementObject grandParent2 = grandParents.iterator().next();`