Author: sergeyb Date: Wed Feb 13 13:18:15 2013 New Revision: 1445580 URL: http://svn.apache.org/r1445580 Log: Merged revisions 1442127 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1442127 | sergeyb | 2013-02-04 14:12:13 +0000 (Mon, 04 Feb 2013) | 9 lines 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.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Feb 13 13:18:15 2013 @@ -0,0 +1,2 @@ +/cxf/branches/2.7.x-fixes:1442127 +/cxf/trunk:1442077 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1445580&r1=1445579&r2=1445580&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java Wed Feb 13 13:18:15 2013 @@ -647,38 +647,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; }
