You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/01/05 22:58:17 UTC
svn commit: r1055660 - in /cxf/branches/2.3.x-fixes: ./
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java
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