You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2016/11/05 11:44:18 UTC
svn commit: r1768200 - in /openjpa/branches/2.4.x: ./
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
Author: struberg
Date: Sat Nov 5 11:44:18 2016
New Revision: 1768200
URL: http://svn.apache.org/viewvc?rev=1768200&view=rev
Log:
OPENJPA-2675 implement null-check for CriteriaQueryImpl#equals
txs to Kaloyan Spiridonov for the catch!
Modified:
openjpa/branches/2.4.x/ (props changed)
openjpa/branches/2.4.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
Propchange: openjpa/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 5 11:44:18 2016
@@ -4,4 +4,4 @@
/openjpa/branches/2.2.1.x:1415367,1415413,1415425,1504719,1508186,1530347,1533222,1539193,1651808,1686910
/openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223,1580898,1580939,1591681,1631786,1641906,1642555,1666312,1686911,1700884,1702143,1728038,1756046,1756538
/openjpa/branches/2.3.x:1533462,1535560,1536912,1540277,1564121
-/openjpa/trunk:1757057,1757131
+/openjpa/trunk:1757057,1757131,1768191
Modified: openjpa/branches/2.4.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.4.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java?rev=1768200&r1=1768199&r2=1768200&view=diff
==============================================================================
--- openjpa/branches/2.4.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java (original)
+++ openjpa/branches/2.4.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaQueryImpl.java Sat Nov 5 11:44:18 2016
@@ -736,6 +736,10 @@ class CriteriaQueryImpl<T> implements Op
}
public boolean equals(Object other) {
+ if(other == null) {
+ return false;
+ }
+
if (toString().equals(other.toString()))
return true;
return false;