Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 69747 invoked from network); 9 Mar 2010 03:18:54 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Mar 2010 03:18:54 -0000 Received: (qmail 49079 invoked by uid 500); 9 Mar 2010 03:18:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 49017 invoked by uid 500); 9 Mar 2010 03:18:28 -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 49010 invoked by uid 99); 9 Mar 2010 03:18:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 03:18:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 09 Mar 2010 03:18:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BA2A823889E2; Tue, 9 Mar 2010 03:18:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r920638 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java Date: Tue, 09 Mar 2010 03:18:07 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100309031807.BA2A823889E2@eris.apache.org> Author: dkulp Date: Tue Mar 9 03:18:04 2010 New Revision: 920638 URL: http://svn.apache.org/viewvc?rev=920638&view=rev Log: Merged revisions 920636 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r920636 | dkulp | 2010-03-08 22:14:52 -0500 (Mon, 08 Mar 2010) | 3 lines [CXF-2697] Fill in argument list with proper null values if no args are given. Patch from Dieter Freismuth applied ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java?rev=920638&r1=920637&r2=920638&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java (original) +++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java Tue Mar 9 03:18:04 2010 @@ -129,7 +129,7 @@ public class URIMappingInterceptor exten protected Map keepInOrder(Map params, OperationInfo operation, List order) { - if (params == null || params.size() == 0) { + if (params == null) { return params; }