Fixed NullPointerException when calling ComposeVariable.startsWithVar…

…iable()
tsantalis · Apr 5, 2016 · 91ec1ac · 91ec1ac
1 parent 994016b
commit 91ec1ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/gr/uom/java/ast/decomposition/cfg/MethodCallAnalyzer.java b/src/gr/uom/java/ast/decomposition/cfg/MethodCallAnalyzer.java
@@ -110,7 +110,7 @@ public void processArgumentsOfInternalMethodInvocation(ClassObject classObject,
 					}
 					else if(usedField instanceof CompositeVariable) {
 						CompositeVariable composite = (CompositeVariable)usedField;
-						if(composite.startsWithVariable(variable)) {
+						if(variable != null && composite.startsWithVariable(variable)) {
 							//getRightPart() is not correct if variable is a CompositeVariable
 							cache.addUsedFieldForMethodExpression(composite.getRightPartAfterPrefix(variable), methodObject);
 							usedFieldCount++;
@@ -134,7 +134,7 @@ else if(usedField instanceof CompositeVariable) {
 					}
 					else if(definedField instanceof CompositeVariable) {
 						CompositeVariable composite = (CompositeVariable)definedField;
-						if(composite.startsWithVariable(variable)) {
+						if(variable != null && composite.startsWithVariable(variable)) {
 							//getRightPart() is not correct if variable is a CompositeVariable
 							cache.addDefinedFieldForMethodExpression(composite.getRightPartAfterPrefix(variable), methodObject);
 							definedFieldCount++;