cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1054886 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Date Tue, 04 Jan 2011 03:42:51 GMT
Author: dkulp
Date: Tue Jan  4 03:42:51 2011
New Revision: 1054886

URL: http://svn.apache.org/viewvc?rev=1054886&view=rev
Log:
Merged revisions 1054883 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1054883 | dkulp | 2011-01-03 22:40:03 -0500 (Mon, 03 Jan 2011) | 2 lines
  
  [CXF-2697] If order.size() == 0, allow the empty params.
  Patch from Dieter Freismuth applied
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=1054886&r1=1054885&r2=1054886&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java
Tue Jan  4 03:42:51 2011
@@ -134,11 +134,7 @@ public class URIMappingInterceptor exten
     protected Map<String, String> keepInOrder(Map<String, String> params, 
                                               OperationInfo operation,
                                               List<String> order) {
-        if (params == null) {
-            return params;
-        }
-        
-        if (order == null || order.size() == 0) {
+        if (params == null || order == null) {
             return params;
         }
                 
@@ -148,12 +144,12 @@ public class URIMappingInterceptor exten
         }
         
         if (order.size() != params.size()) {
-            LOG.info(order.size()
+            LOG.fine(order.size()
                      + " parameters definded in WSDL but found " 
                      + params.size() + " in request!");            
             Collection rest = CollectionUtils.diff(order, params.keySet());
             if (rest != null && rest.size() > 0) {
-                LOG.info("Set the following parameters to null: " + rest);
+                LOG.fine("Set the following parameters to null: " + rest);
                 for (Iterator iter = rest.iterator(); iter.hasNext();) {
                     String key = (String)iter.next();
                     orderedParameters.put(key, null);



Mime
View raw message