commit c092fb4c746789231106ce51f4a8141e191dcc3a
author Radu Cotescu <radu@apache.org> Thu Aug 27 12:16:00 2020 +0200
committer Radu Cotescu <radu@apache.org> Thu Aug 27 12:16:18 2020 +0200
tree 78975a1b89723c85af1ad6ab745cf53468d21d87
parent 00e83a1079cfb3a56e03380d8e6bfaba80452d0b

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

src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/operator/EquivalenceOpGen.java

diff --git a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/operator/EquivalenceOpGen.java b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/operator/EquivalenceOpGen.java
index 4a6d79b..eeb6676 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/operator/EquivalenceOpGen.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/java/compiler/impl/operator/EquivalenceOpGen.java
@@ -44,7 +44,7 @@
         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 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());