SLING-9706 - The HTL Java Compiler does not correctly negate equals

apache · Aug 27, 2020 · c092fb4 · c092fb4
1 parent 00e83a1
commit c092fb4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...java/org/apache/sling/scripting/sightly/java/compiler/impl/operator/EquivalenceOpGen.java b/...java/org/apache/sling/scripting/sightly/java/compiler/impl/operator/EquivalenceOpGen.java
@@ -44,7 +44,7 @@ public void generate(JavaSource source, ExpressionTranslator visitor, TypedNode
         Type type = OpHelper.sameType(left, right);
         if (type != null && OpHelper.isNumericType(type) || type == Type.BOOLEAN || type == Type.UNKNOWN) {
             generateEqualsOperator(source, visitor, left.getNode(), right.getNode());
-        } else if (type != Type.UNKNOWN) {
+        } else {
             generateEqualsMethod(source, visitor, left, right);
         }
     }
@@ -62,6 +62,9 @@ private void generateCheckedEquals(JavaSource source, SideEffectVisitor visitor,
 
     private void generateEqualsMethod(JavaSource source, SideEffectVisitor visitor, TypedNode leftNode, TypedNode rightNode) {
         boolean performCast = leftNode.getType().isPrimitive();
+        if (negated) {
+            source.negation();
+        }
         if (performCast) {
             source.startExpression();
             source.cast(Type.UNKNOWN.getNativeClass());