You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/02/24 15:24:01 UTC

svn commit: r915799 - /openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java

Author: dwoods
Date: Wed Feb 24 14:24:01 2010
New Revision: 915799

URL: http://svn.apache.org/viewvc?rev=915799&view=rev
Log:
OPENJPA-1413 NPE when update using CASE statement on Derby.  Merged in from trunk r886991 by Fay Wang.

Modified:
    openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java

Modified: openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java?rev=915799&r1=915798&r2=915799&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java (original)
+++ openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CompareEqualExpression.java Wed Feb 24 14:24:01 2010
@@ -96,7 +96,8 @@
         boolean val2Null = _val2 instanceof Const
             && ((Const) _val2).isSQLValueNull(sel, ctx, bstate.state2);
         appendTo(sel, ctx, bstate, buf, val1Null, val2Null);
-        sel.append(buf, state.joins);
+        if (sel != null)
+            sel.append(buf, state.joins);
     }
 
     public void selectColumns(Select sel, ExpContext ctx, ExpState state,