From 6cff1f63bb67a0d105136e4a0af02dd1ab03ebc2 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Mon, 24 Jun 2013 14:08:47 -0500 Subject: [PATCH] Issue #2126 - updated for Java 7 compatibility; compatible with both Java 6 and Java 7 Former-commit-id: 5b85217ca20003dc0e0793205f8f0fa4ce22cb96 [formerly 5b85217ca20003dc0e0793205f8f0fa4ce22cb96 [formerly 9b6169bf7d86c9fa842f15aa6a8ba0777804be26]] Former-commit-id: cd2af684caaac631ef220cd7ccb1a9a599ff35f1 Former-commit-id: 7ebee00dc99f1d7d4be10f7a10fc7f59f1276487 --- .../serialization/jaxb/SerializationContextFactory.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/SerializationContextFactory.java b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/SerializationContextFactory.java index 564d83867c..31dab55b04 100644 --- a/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/SerializationContextFactory.java +++ b/edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/jaxb/SerializationContextFactory.java @@ -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 * * * @@ -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); }