Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 41879 invoked from network); 1 Apr 2008 21:29:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Apr 2008 21:29:51 -0000 Received: (qmail 99471 invoked by uid 500); 1 Apr 2008 21:29:51 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 99458 invoked by uid 500); 1 Apr 2008 21:29:51 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 99448 invoked by uid 99); 1 Apr 2008 21:29:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 14:29:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 21:29:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CFF0A1A983A; Tue, 1 Apr 2008 14:29:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643586 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java Date: Tue, 01 Apr 2008 21:29:27 -0000 To: commits@openjpa.apache.org From: awhite@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080401212927.CFF0A1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: awhite Date: Tue Apr 1 14:29:26 2008 New Revision: 643586 URL: http://svn.apache.org/viewvc?rev=643586&view=rev Log: Always consider the inclusion of subclasses as part of the query compilation key, even when the candidate class is encoded in the query string instead of set programmatically. Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java?rev=643586&r1=643585&r2=643586&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java Tue Apr 1 14:29:26 2008 @@ -1719,6 +1719,8 @@ rs = 37 * rs + ((query == null) ? 0 : query.hashCode()); rs = 37 * rs + ((language == null) ? 0 : language.hashCode()); rs = 37 * rs + ((storeKey == null) ? 0 : storeKey.hashCode()); + if (subclasses) + rs++; return rs; } @@ -1733,18 +1735,16 @@ || !StringUtils.equals(key.query, query) || !StringUtils.equals(key.language, language)) return false; - + if (key.subclasses != subclasses) + return false; if (!ObjectUtils.equals(key.storeKey, storeKey)) return false; // allow either candidate type to be null because it might be // encoded in the query string, but if both are set then they // must be equal - if (candidateType != null && key.candidateType != null) - return candidateType == key.candidateType - && subclasses == key.subclasses; - - return true; + return key.candidateType == null || candidateType == null + || key.candidateType == candidateType; } }