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 2013/08/01 17:20:09 UTC
svn commit: r1509284 -
/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
Author: dkulp
Date: Thu Aug 1 15:20:08 2013
New Revision: 1509284
URL: http://svn.apache.org/r1509284
Log:
Merged revisions 1509257 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1509257 | dkulp | 2013-08-01 10:36:47 -0400 (Thu, 01 Aug 2013) | 10 lines
Merged revisions 1509251 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1509251 | dkulp | 2013-08-01 10:30:25 -0400 (Thu, 01 Aug 2013) | 2 lines
[CXF-5163] Fix test failure with Java6/JAXB 2.1
........
........
Modified:
cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
Modified: cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java?rev=1509284&r1=1509283&r2=1509284&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java (original)
+++ cxf/branches/2.6.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java Thu Aug 1 15:20:08 2013
@@ -455,8 +455,9 @@ public class JAXBEncoderDecoderTest exte
part.setElementQName(elName);
part.setTypeClass(OrderException.class);
+ //just need a simple generic context to handle the exceptions internal primitives
JAXBContext exceptionContext = JAXBContext.newInstance(new Class[] {
- OrderException.class,
+ String.class,
});
JAXBEncoderDecoder.marshallException(exceptionContext.createMarshaller(), exception, part, elNode);