svn commit: r1442127 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java

[sergeyb]

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;
     }