Author: dkulp
Date: Tue Feb 28 22:24:13 2012
New Revision: 1294859
URL: http://svn.apache.org/viewvc?rev=1294859&view=rev
Log:
Merged revisions 1294854 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1294854 | dkulp | 2012-02-28 17:20:03 -0500 (Tue, 28 Feb 2012) | 1 line
Use Byte.TYPE instead of byte.class to not confuse various parsers
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java?rev=1294859&r1=1294858&r2=1294859&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
Tue Feb 28 22:24:13 2012
@@ -39,18 +39,18 @@ public class PrimitiveTextProviderTest e
@Test
public void testIsWriteable() {
MessageBodyWriter<Object> p = new PrimitiveTextProvider();
- assertTrue(p.isWriteable(byte.class, null, null, null)
+ assertTrue(p.isWriteable(Byte.TYPE, null, null, null)
&& p.isWriteable(Byte.class, null, null, null)
- && p.isWriteable(boolean.class, null, null, null)
+ && p.isWriteable(Boolean.TYPE, null, null, null)
&& p.isWriteable(Boolean.class, null, null, null));
}
@Test
public void testIsReadable() {
MessageBodyReader<Object> p = new PrimitiveTextProvider();
- assertTrue(p.isReadable(byte.class, null, null, null)
+ assertTrue(p.isReadable(Byte.TYPE, null, null, null)
&& p.isReadable(Byte.class, null, null, null)
- && p.isReadable(boolean.class, null, null, null)
+ && p.isReadable(Boolean.TYPE, null, null, null)
&& p.isReadable(Boolean.class, null, null, null));
}
@@ -59,7 +59,7 @@ public class PrimitiveTextProviderTest e
public void testReadByte() throws Exception {
MessageBodyReader p = new PrimitiveTextProvider();
- Byte valueRead = (Byte)p.readFrom(byte.class,
+ Byte valueRead = (Byte)p.readFrom((Class)Byte.TYPE,
null,
null,
null,
@@ -74,7 +74,7 @@ public class PrimitiveTextProviderTest e
public void testReadBoolean() throws Exception {
MessageBodyReader p = new PrimitiveTextProvider();
- boolean valueRead = (Boolean)p.readFrom(boolean.class,
+ boolean valueRead = (Boolean)p.readFrom(Boolean.TYPE,
null,
null,
null,