@@ -220,7 +220,7 @@ public void visit(SuperConstructorInvocationExpression expression) {
220220 BaseExpression parameters = expression .getParameters ();
221221
222222 if (parameters != null ) {
223- boolean force = containsNullExpression (parameters ) && typeMaker .multipleMethods (expression .getObjectType ().getInternalName (), "<init>" , parameters .size ());
223+ boolean force = (parameters . size () > 0 ) && typeMaker .multipleMethods (expression .getObjectType ().getInternalName (), "<init>" , parameters .size ());
224224 expression .setParameters (updateExpressions (((ClassFileSuperConstructorInvocationExpression )expression ).getParameterTypes (), parameters , force ));
225225 }
226226 }
@@ -230,7 +230,7 @@ public void visit(ConstructorInvocationExpression expression) {
230230 BaseExpression parameters = expression .getParameters ();
231231
232232 if (parameters != null ) {
233- boolean force = containsNullExpression (parameters ) && typeMaker .multipleMethods (expression .getObjectType ().getInternalName (), "<init>" , parameters .size ());
233+ boolean force = (parameters . size () > 0 ) && typeMaker .multipleMethods (expression .getObjectType ().getInternalName (), "<init>" , parameters .size ());
234234 expression .setParameters (updateExpressions (((ClassFileConstructorInvocationExpression )expression ).getParameterTypes (), parameters , force ));
235235 }
236236 }
@@ -240,29 +240,13 @@ public void visit(MethodInvocationExpression expression) {
240240 BaseExpression parameters = expression .getParameters ();
241241
242242 if (parameters != null ) {
243- boolean force = containsNullExpression (parameters ) && typeMaker .multipleMethods (expression .getInternalTypeName (), expression .getName (), parameters .size ());
243+ boolean force = (parameters . size () > 0 ) && typeMaker .multipleMethods (expression .getInternalTypeName (), expression .getName (), parameters .size ());
244244 expression .setParameters (updateExpressions (((ClassFileMethodInvocationExpression )expression ).getParameterTypes (), parameters , force ));
245245 }
246246
247247 expression .getExpression ().accept (this );
248248 }
249249
250- protected boolean containsNullExpression (BaseExpression parameters ) {
251- switch (parameters .size ()) {
252- case 0 :
253- return false ;
254- case 1 :
255- return parameters .getFirst ().getClass () == NullExpression .class ;
256- default :
257- for (Expression parameter : parameters ) {
258- if (parameter .getClass () == NullExpression .class ) {
259- return true ;
260- }
261- }
262- return false ;
263- }
264- }
265-
266250 @ Override
267251 public void visit (NewExpression expression ) {
268252 BaseExpression parameters = expression .getParameters ();
0 commit comments