Additional changes for issue #70

tsantalis · Oct 11, 2019 · 8db9766 · 8db9766
1 parent 5268818
commit 8db9766
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/gr/uom/java/jdeodorant/refactoring/manipulators/ExtractMethodFragmentRefactoring.java b/src/gr/uom/java/jdeodorant/refactoring/manipulators/ExtractMethodFragmentRefactoring.java
@@ -338,7 +338,7 @@ else if(controlDependence.isFalseControlDependence()) {
 						PDGControlPredicateNode dstPredicateNode = (PDGControlPredicateNode)dstPDGNode;
 						listRewrite.insertLast(processPredicateNode(dstPredicateNode, ast, sourceRewriter, sliceNodes), null);
 					}
-					else {
+					else if(!tryStatementBodyRewriteMap.containsKey(dstPDGNode.getASTStatement())) {
 						processStatementNode(listRewrite, dstPDGNode, ast, sourceRewriter);
 						sliceNodes.remove(dstPDGNode);
 					}
@@ -366,7 +366,7 @@ else if(trueControlDependentChildren.size() == 1) {
 						PDGControlPredicateNode dstPredicateNode = (PDGControlPredicateNode)dstPDGNode;
 						listRewrite.insertLast(processPredicateNode(dstPredicateNode, ast, sourceRewriter, sliceNodes), null);
 					}
-					else {
+					else if(!tryStatementBodyRewriteMap.containsKey(dstPDGNode.getASTStatement())) {
 						processStatementNode(listRewrite, dstPDGNode, ast, sourceRewriter);
 						sliceNodes.remove(dstPDGNode);
 					}
@@ -404,7 +404,7 @@ else if(oldPredicateStatement instanceof SwitchStatement) {
 							PDGControlPredicateNode dstPredicateNode = (PDGControlPredicateNode)dstPDGNode;
 							bodyRewrite.insertLast(processPredicateNode(dstPredicateNode, ast, sourceRewriter, sliceNodes), null);
 						}
-						else {
+						else if(!tryStatementBodyRewriteMap.containsKey(dstPDGNode.getASTStatement())) {
 							processStatementNode(bodyRewrite, dstPDGNode, ast, sourceRewriter);
 							sliceNodes.remove(dstPDGNode);
 						}