You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pp...@apache.org on 2009/08/14 07:56:51 UTC

svn commit: r804084 - /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java

Author: ppoddar
Date: Fri Aug 14 05:56:51 2009
New Revision: 804084

URL: http://svn.apache.org/viewvc?rev=804084&view=rev
Log:
OPENJPA-1013: Coalesce expression type minor bug.

Modified:
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java?rev=804084&r1=804083&r2=804084&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilder.java Fri Aug 14 05:56:51 2009
@@ -159,17 +159,15 @@
         return new Expressions.Coalesce(Object.class);
     }
 
-    public <Y> Expression<Y> coalesce(Expression<? extends Y> x,
-        Expression<? extends Y> y) {
-    	return new Expressions.Coalesce(x.getClass()).value(x).value(y);
+    public <Y> Expression<Y> coalesce(Expression<? extends Y> x, Expression<? extends Y> y) {
+    	return new Expressions.Coalesce(x.getJavaType()).value(x).value(y);
     }
 
     public <Y> Expression<Y> coalesce(Expression<? extends Y> x, Y y) {
-    	return new Expressions.Coalesce(x.getClass()).value(x).value(y);
+    	return new Expressions.Coalesce(x.getJavaType()).value(x).value(y);
    }
 
-    public Expression<String> concat(Expression<String> x, 
-        Expression<String> y) {
+    public Expression<String> concat(Expression<String> x, Expression<String> y) {
     	return new Expressions.Concat(x, y);
     }