Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 79089 invoked from network); 4 Mar 2008 15:48:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Mar 2008 15:48:44 -0000 Received: (qmail 91163 invoked by uid 500); 4 Mar 2008 15:48:19 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 91137 invoked by uid 500); 4 Mar 2008 15:48:19 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 91124 invoked by uid 99); 4 Mar 2008 15:48:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Mar 2008 07:48:19 -0800 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, 04 Mar 2008 15:47:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 863B01A9832; Tue, 4 Mar 2008 07:48:02 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r633519 - /jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java Date: Tue, 04 Mar 2008 15:48:01 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080304154802.863B01A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Tue Mar 4 07:48:00 2008 New Revision: 633519 URL: http://svn.apache.org/viewvc?rev=633519&view=rev Log: JCR-1104: JSR 283 support - check for duplicate selector name Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java?rev=633519&r1=633518&r2=633519&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java (original) +++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/QueryObjectModelTree.java Tue Mar 4 07:48:00 2008 @@ -69,7 +69,10 @@ this.columns = columns; for (Iterator it = Arrays.asList(source.getSelectors()).iterator(); it.hasNext(); ) { SelectorImpl selector = (SelectorImpl) it.next(); - selectors.put(selector.getSelectorQName(), selector); + if (selectors.put(selector.getSelectorQName(), selector) != null) { + throw new InvalidQueryException("Duplicate selector name: " + + selector.getSelectorName()); + } } if (selectors.size() == 1) { // there is only one selector, which is also a default selector