Fix syntax errors in decompiled sources

Author: emmanue1

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/model/localvariable/ObjectLocalVariable.java

@@ -139,7 +139,7 @@ public void typeOnRight(Map<String, BaseType> typeBounds, Type type) {
 
     @Override
     public void typeOnLeft(Map<String, BaseType> typeBounds, Type type) {
-        if (type != TYPE_UNDEFINED_OBJECT) {
+        if ((type != TYPE_UNDEFINED_OBJECT) && !type.equals(TYPE_OBJECT)) {
             if (this.type == TYPE_UNDEFINED_OBJECT) {
                 this.type = type;
                 fireChangeEvent(typeBounds);

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/ByteCodeParser.java

@@ -891,12 +891,14 @@ public void parse(BasicBlock basicBlock, Statements statements, DefaultStack<Exp
                     break;
                 case 198: // IFNULL
                     expression1 = stack.pop();
+                    typeParametersToTypeArgumentsBinder.bindParameterTypesWithArgumentTypes(TYPE_OBJECT, expression1);
                     stack.push(new BinaryOperatorExpression(lineNumber, TYPE_BOOLEAN, expression1, basicBlock.mustInverseCondition() ? "!=" : "==", new NullExpression(expression1.getLineNumber(), expression1.getType()), 9));
                     offset += 2; // Skip branch offset
                     checkStack(stack, code, offset);
                     break;
                 case 199: // IFNONNULL
                     expression1 = stack.pop();
+                    typeParametersToTypeArgumentsBinder.bindParameterTypesWithArgumentTypes(TYPE_OBJECT, expression1);
                     stack.push(new BinaryOperatorExpression(lineNumber, TYPE_BOOLEAN, expression1, basicBlock.mustInverseCondition() ? "==" : "!=", new NullExpression(expression1.getLineNumber(), expression1.getType()), 9));
                     offset += 2; // Skip branch offset
                     checkStack(stack, code, offset);

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/TypeParametersToTypeArgumentsBinder.java

@@ -19,6 +19,7 @@
 
 import static org.jd.core.v1.model.javasyntax.declaration.Declaration.FLAG_STATIC;
 import static org.jd.core.v1.model.javasyntax.type.ObjectType.TYPE_OBJECT;
+import static org.jd.core.v1.model.javasyntax.type.ObjectType.TYPE_UNDEFINED_OBJECT;
 
 public class TypeParametersToTypeArgumentsBinder {
     protected PopulateBindingsWithTypeParameterVisitor populateBindingsWithTypeParameterVisitor = new PopulateBindingsWithTypeParameterVisitor();
@@ -407,7 +408,7 @@ protected boolean eraseTypeArguments(Expression expression, BaseTypeParameter ty
     protected void populateBindingsWithTypeArgument(Map<String, TypeArgument> bindings, Map<String, BaseType> typeBounds, Type type, Expression expression) {
         Type t = getExpressionType(expression);
 
-        if (t != null) {
+        if ((t != null) && (t != TYPE_UNDEFINED_OBJECT)) {
             populateBindingsWithTypeArgumentVisitor.init(contextualTypeBounds, bindings, typeBounds, t);
             type.accept(populateBindingsWithTypeArgumentVisitor);
         }