xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7" into development

Browse source 
Former-commit-id: ed31841e537d54ead391013919a94c879afd6f77
This commit is contained in:
Richard Peter 2013-06-24 17:20:10 -05:00 • committed by Gerrit Code Review
commit a19a946a24
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/SerializationContextFactory.java
View file

@ -45,6 +45,7 @@ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.JAXBContextBuilder;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 12, 2011 mschenke Initial creation
* June 24, 2013 #2126 bkowal Update for Java 7 compatibility
*
* </pre>
*
@ -54,7 +55,8 @@ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.JAXBContextBuilder;
public class SerializationContextFactory {
public static JAXBContext createContext(Class[] classes, Map props) {
@SuppressWarnings("rawtypes")
public static JAXBContext createContext(Class[] classes, Map props) {
// Construct delegate implementation
System.setProperty(JAXBContextImpl.class.getName() + ".fastBoot",
"true");
@ -68,7 +70,7 @@ public class SerializationContextFactory {
// TODO: Can we override/extend some part of the context
// implementation to allow for ignoring of xsi:type fields that we
// don't have classes for?
return new CustomJAXBContext(new JAXBContextImpl(builder));
return new CustomJAXBContext(builder.build());
} catch (JAXBException e) {
throw new RuntimeException(e);
}