short-circuit evaluation of 'AND' logic operator in SpEl [SPRNET-1381]

src/Spring/Spring.Core/Expressions/OpAND.cs

@@ -1,85 +1,93 @@
-#region License
-
-/*
- * Copyright <20> 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#endregion
-
-using System;
+#region License
+
+/*
+ * Copyright <20> 2002-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#endregion
+
+using System;
 using System.Runtime.Serialization;
-using Spring.Util;
-
-namespace Spring.Expressions
-{
+using Spring.Util;
+
+namespace Spring.Expressions
+{
     /// <summary>
     /// Represents AND operator (both, bitwise and logical).
-    /// </summary>
-    /// <author>Aleksandar Seovic</author>
-    [Serializable]
-    public class OpAND : BinaryOperator
-    {
-        /// <summary>
-        /// Create a new instance
-        /// </summary>
-        public OpAND()
-        {
-        }
-
-        /// <summary>
-        /// Create a new instance
-        /// </summary>
-        public OpAND(BaseNode left, BaseNode right)
-            :base(left, right)
-        {
-        }
-
-        /// <summary>
-        /// Create a new instance from SerializationInfo
-        /// </summary>
-        protected OpAND(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-        
-        /// <summary>
-        /// Returns a value for the logical AND operator node.
-        /// </summary>
-        /// <param name="context">Context to evaluate expressions against.</param>
-        /// <param name="evalContext">Current expression evaluation context.</param>
+    /// </summary>
+    /// <author>Aleksandar Seovic</author>
+    [Serializable]
+    public class OpAND : BinaryOperator
+    {
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpAND()
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance
+        /// </summary>
+        public OpAND(BaseNode left, BaseNode right)
+            :base(left, right)
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance from SerializationInfo
+        /// </summary>
+        protected OpAND(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+        
+        /// <summary>
+        /// Returns a value for the logical AND operator node.
+        /// </summary>
+        /// <param name="context">Context to evaluate expressions against.</param>
+        /// <param name="evalContext">Current expression evaluation context.</param>
         /// <returns>Node's value.</returns>
-        protected override object Get(object context, EvaluationContext evalContext)
-        {
-            object l = GetLeftValue(context, evalContext);
-            object r = GetRightValue(context, evalContext);
-
-            if (NumberUtils.IsInteger(l) && NumberUtils.IsInteger(r))
+        protected override object Get(object context, EvaluationContext evalContext)
+        {
+            object l = GetLeftValue(context, evalContext);
+
+            if (NumberUtils.IsInteger(l))
             {
-                return NumberUtils.BitwiseAnd(l, r);
+                object r = GetRightValue(context, evalContext);
+                if (NumberUtils.IsInteger(r))
+                {
+                    return NumberUtils.BitwiseAnd(l, r);
+                }
             }
-            else if (l is Enum && l.GetType() == r.GetType())
+            else if (l is Enum)
             {
-                Type enumType = l.GetType();
-                Type integralType = Enum.GetUnderlyingType(enumType);
-                l = Convert.ChangeType(l, integralType);
-                r = Convert.ChangeType(r, integralType);
-                object result = NumberUtils.BitwiseAnd(l, r);
-                return Enum.ToObject(enumType, result);
+                object r = GetRightValue(context, evalContext);
+                if (l.GetType() == r.GetType())
+                {
+                    Type enumType = l.GetType();
+                    Type integralType = Enum.GetUnderlyingType(enumType);
+                    l = Convert.ChangeType(l, integralType);
+                    r = Convert.ChangeType(r, integralType);
+                    object result = NumberUtils.BitwiseAnd(l, r);
+                    return Enum.ToObject(enumType, result);
+                }
             }
-            else
-                return Convert.ToBoolean(l) && Convert.ToBoolean(r);
-        }
-    }
+
+            return Convert.ToBoolean(l) &&
+                Convert.ToBoolean(GetRightValue(context, evalContext));
+        }
+    }
 }

test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs

@@ -272,6 +272,13 @@ namespace Spring.Expressions
 
         #endregion Serialization Tests
 
+        [Test(Description = "SPRNET-1381")]
+        public void TestShortcircuitAndOperator()
+        {
+            object boolean = ExpressionEvaluator.GetValue(new Inventor(), "Name != null and Name.Length == 0");
+            Assert.AreEqual(false, boolean);
+        }
+
         [Test]
         public void TestBitwiseXOR()
         {