Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 3692 invoked from network); 5 Jan 2011 21:58:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Jan 2011 21:58:39 -0000 Received: (qmail 64890 invoked by uid 500); 5 Jan 2011 21:58:39 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64853 invoked by uid 500); 5 Jan 2011 21:58:39 -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 64846 invoked by uid 99); 5 Jan 2011 21:58:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jan 2011 21:58:39 +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; Wed, 05 Jan 2011 21:58:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2573823889E0; Wed, 5 Jan 2011 21:58:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1055660 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java Date: Wed, 05 Jan 2011 21:58:17 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110105215817.2573823889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Jan 5 21:58:16 2011 New Revision: 1055660 URL: http://svn.apache.org/viewvc?rev=1055660&view=rev Log: Merged revisions 1055584 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1055584 | dkulp | 2011-01-05 14:03:21 -0500 (Wed, 05 Jan 2011) | 1 line [CXF-3085] Fix warning ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 5 21:58:16 2011 @@ -1 +1 @@ -/cxf/trunk:1055184,1055554,1055566,1055582,1055649 +/cxf/trunk:1055184,1055554,1055566,1055582,1055584,1055649 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java?rev=1055660&r1=1055659&r2=1055660&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java Wed Jan 5 21:58:16 2011 @@ -633,10 +633,9 @@ public class UriBuilderImplTest extends } @Test - @SuppressWarnings("all") public void testNullQueryParamValues() { try { - UriBuilder.fromPath("http://localhost:8080").queryParam("hello", null); + UriBuilder.fromPath("http://localhost:8080").queryParam("hello", (Object[])null); fail("Should be IllegalArgumentException"); } catch (IllegalArgumentException ex) { //expected