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

Posted to commits@openjpa.apache.org by aw...@apache.org on 2006/08/02 21:21:32 UTC

svn commit: r428102 - /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java

Author: awhite
Date: Wed Aug  2 12:21:31 2006
New Revision: 428102

URL: http://svn.apache.org/viewvc?rev=428102&view=rev
Log:
Query type promotion fix.


Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java?rev=428102&r1=428101&r2=428102&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java Wed Aug  2 12:21:31 2006
@@ -112,6 +112,11 @@
     public static Class promote(Class c1, Class c2) {
         if (c1 == c2)
             return c1;
+        if (c1 == Object.class)
+            return c2;
+        if (c2 == Object.class)
+            return c1;
+
         Class w1 = wrap(c1);
         Class w2 = wrap(c2);
         if (w1 == w2)