Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 37409 invoked from network); 18 Sep 2008 21:27:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Sep 2008 21:27:31 -0000 Received: (qmail 4006 invoked by uid 500); 18 Sep 2008 21:27:28 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 3997 invoked by uid 500); 18 Sep 2008 21:27:27 -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 3988 invoked by uid 99); 18 Sep 2008 21:27:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2008 14:27:27 -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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2008 21:26:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A04C2388A1B; Thu, 18 Sep 2008 14:26:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r696818 - /openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java Date: Thu, 18 Sep 2008 21:26:40 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080918212640.3A04C2388A1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ppoddar Date: Thu Sep 18 14:26:39 2008 New Revision: 696818 URL: http://svn.apache.org/viewvc?rev=696818&view=rev Log: OPENJPA-710: Merge to 1.2.x Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java?rev=696818&r1=696817&r2=696818&view=diff ============================================================================== --- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java (original) +++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/StoreCollectionFieldStrategy.java Thu Sep 18 14:26:39 2008 @@ -226,7 +226,11 @@ joins = sel.outer(joins); if (!selectOid) { Column[] refs = getJoinForeignKey(elem).getColumns(); - sel.orderBy(refs, true, joins, true); + if (requiresOrderBy()) { + sel.orderBy(refs, true, joins, true); + } else { + sel.select(refs, joins); + } } field.orderLocal(sel, elem, joins); } @@ -662,4 +666,8 @@ protected ForeignKey getJoinForeignKey() { return getJoinForeignKey(getDefaultElementMapping(false)); } + + boolean requiresOrderBy() { + return List.class.isAssignableFrom(field.getProxyType()); + } }