Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB1A9DCB4 for ; Mon, 10 Dec 2012 17:15:42 +0000 (UTC) Received: (qmail 6607 invoked by uid 500); 10 Dec 2012 17:15:42 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6526 invoked by uid 500); 10 Dec 2012 17:15:41 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 6512 invoked by uid 99); 10 Dec 2012 17:15:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Dec 2012 17:15:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 10 Dec 2012 17:15:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 729F923888CD; Mon, 10 Dec 2012 17:15:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1419591 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java Date: Mon, 10 Dec 2012 17:15:18 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121210171518.729F923888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Dec 10 17:15:17 2012 New Revision: 1419591 URL: http://svn.apache.org/viewvc?rev=1419591&view=rev Log: Merged revisions 1419588 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1419588 | sergeyb | 2012-12-10 17:13:11 +0000 (Mon, 10 Dec 2012) | 1 line Removing the duplicate path alias call ........ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk:1419588 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java?rev=1419591&r1=1419590&r2=1419591&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/jpa/AbstractJPATypedQueryVisitor.java Mon Dec 10 17:15:17 2012 @@ -176,9 +176,6 @@ public abstract class AbstractJPATypedQu value = cv.getValue(); Path path = getPath(root, name, cv); - if (tClass != queryClass) { - path.alias(name); - } Predicate pred = null; switch (ct) {