svn commit: r1797211 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java pom.xml

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1797211 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java pom.xml

ilgrosso
Author: ilgrosso
Date: Thu Jun  1 12:16:02 2017
New Revision: 1797211

URL: http://svn.apache.org/viewvc?rev=1797211&view=rev
Log:
changed version of maven-jar-plugin to 3.0.2 - This closes #8

Modified:
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java?rev=1797211&r1=1797210&r2=1797211&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java Thu Jun  1 12:16:02 2017
@@ -1137,13 +1137,14 @@ public class JPQLExpressionBuilder
                 return factory.divide(val1, val2);
 
             case JJTBETWEEN: // x.field [NOT] BETWEEN 5 AND 10
-                val1 = getValue(child(node, 0, 3));
+                Value val_min = getValue(child(node, 0, 3));
+                Value val_max = getValue(child(node, 0, 3));
                 val2 = getValue(child(node, 1, 3));
                 val3 = getValue(child(node, 2, 3));
-                setImplicitTypes(val1, val2, null);
-                setImplicitTypes(val1, val3, null);
-                return evalNot(not, and(factory.greaterThanEqual(val1, val2),
-                    factory.lessThanEqual(val1, val3)));
+                setImplicitTypes(val_min, val2, null);
+                setImplicitTypes(val_max, val3, null);
+                return evalNot(not, and(factory.greaterThanEqual(val_min, val2),
+                    factory.lessThanEqual(val_max, val3)));
 
             case JJTIN: // x.field [NOT] IN ('a', 'b', 'c')
                         // TYPE(x...) [NOT] IN (entityTypeLiteral1,...)

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1797211&r1=1797210&r2=1797211&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Thu Jun  1 12:16:02 2017
@@ -840,7 +840,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.0.2</version>
                     <executions>
                         <execution>
                             <id>default-jar</id>