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 18E55EFB8 for ; Mon, 4 Feb 2013 14:12:38 +0000 (UTC) Received: (qmail 40841 invoked by uid 500); 4 Feb 2013 14:12:37 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40709 invoked by uid 500); 4 Feb 2013 14:12:37 -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 40701 invoked by uid 99); 4 Feb 2013 14:12:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2013 14:12:37 +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, 04 Feb 2013 14:12:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3799A238896F; Mon, 4 Feb 2013 14:12:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442127 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Date: Mon, 04 Feb 2013 14:12:14 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130204141214.3799A238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Feb 4 14:12:13 2013 New Revision: 1442127 URL: http://svn.apache.org/viewvc?rev=1442127&view=rev Log: Merged revisions 1442077 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1442077 | sergeyb | 2013-02-04 11:15:55 +0000 (Mon, 04 Feb 2013) | 1 line Minor optimization to JAXRSUtils ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1442077 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1442127&r1=1442126&r2=1442127&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Mon Feb 4 14:12:13 2013 @@ -720,38 +720,36 @@ public final class JAXRSUtils { defaultValue = ori.getDefaultParameterValue(); } - Object result = null; - if (parameter.getType() == ParameterType.PATH) { - result = readFromUriParam(message, parameter.getName(), parameterClass, genericParam, + return readFromUriParam(message, parameter.getName(), parameterClass, genericParam, paramAnns, values, defaultValue, !isEncoded); } if (parameter.getType() == ParameterType.QUERY) { - result = readQueryString(parameter.getName(), parameterClass, genericParam, + return readQueryString(parameter.getName(), parameterClass, genericParam, paramAnns, message, defaultValue, !isEncoded); } if (parameter.getType() == ParameterType.MATRIX) { - result = processMatrixParam(message, parameter.getName(), parameterClass, genericParam, + return processMatrixParam(message, parameter.getName(), parameterClass, genericParam, paramAnns, defaultValue, !isEncoded); } if (parameter.getType() == ParameterType.FORM) { - result = processFormParam(message, parameter.getName(), parameterClass, genericParam, + return processFormParam(message, parameter.getName(), parameterClass, genericParam, paramAnns, defaultValue, !isEncoded); } if (parameter.getType() == ParameterType.COOKIE) { - result = processCookieParam(message, parameter.getName(), parameterClass, genericParam, + return processCookieParam(message, parameter.getName(), parameterClass, genericParam, paramAnns, defaultValue); } + Object result = null; if (parameter.getType() == ParameterType.HEADER) { result = processHeaderParam(message, parameter.getName(), parameterClass, genericParam, paramAnns, defaultValue); - } - + } return result; }