jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java

-:16b4408b82c0
+:9dbb9554e406
 /*
-* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 package com.sun.xml.internal.bind;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.GregorianCalendar;
+import java.util.Map;
 import java.util.TimeZone;
+import java.util.WeakHashMap;
 import javax.xml.bind.DatatypeConverter;
 import javax.xml.bind.DatatypeConverterInterface;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 return new QName(uri, localPart, prefix);
 }
 public static GregorianCalendar _parseDateTime(CharSequence s) {
 String val = WhiteSpaceProcessor.trim(s).toString();
-return datatypeFactory.newXMLGregorianCalendar(val).toGregorianCalendar();
+return getDatatypeFactory().newXMLGregorianCalendar(val).toGregorianCalendar();
 }
 public static String _printDateTime(Calendar val) {
 return CalendarFormatter.doFormat("%Y-%M-%DT%h:%m:%s%z", val);
 }
 if (ch == '+' || ch == '-' || ch == '.') {
 return true;
 }
 return false;
 }
-private static final DatatypeFactory datatypeFactory;
+private static final Map<ClassLoader, DatatypeFactory> DF_CACHE = Collections.synchronizedMap(new WeakHashMap<ClassLoader, DatatypeFactory>());
-static {
-try {
+public static DatatypeFactory getDatatypeFactory() {
-datatypeFactory = DatatypeFactory.newInstance();
+ClassLoader tccl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-} catch (DatatypeConfigurationException e) {
+public ClassLoader run() {
-throw new Error(e);
+return Thread.currentThread().getContextClassLoader();
 }
+});
+DatatypeFactory df = DF_CACHE.get(tccl);
+if (df == null) {
+synchronized (DatatypeConverterImpl.class) {
+df = DF_CACHE.get(tccl);
+if (df == null) { // to prevent multiple initialization
+try {
+df = DatatypeFactory.newInstance();
+} catch (DatatypeConfigurationException e) {
+throw new Error(Messages.FAILED_TO_INITIALE_DATATYPE_FACTORY.format(),e);
+}
+DF_CACHE.put(tccl, df);
+}
+}
+}
+return df;
 }
 private static final class CalendarFormatter {
 public static String doFormat(String format, Calendar cal) throws IllegalArgumentException {
 return _parseInt(lexicalXSDUnsignedShort);
 }
 @Deprecated
 public Calendar parseTime(String lexicalXSDTime) {
-return datatypeFactory.newXMLGregorianCalendar(lexicalXSDTime).toGregorianCalendar();
+return getDatatypeFactory().newXMLGregorianCalendar(lexicalXSDTime).toGregorianCalendar();
 }
 @Deprecated
 public String printTime(Calendar val) {
 return CalendarFormatter.doFormat("%h:%m:%s%z", val);
 }
 @Deprecated
 public Calendar parseDate(String lexicalXSDDate) {
-return datatypeFactory.newXMLGregorianCalendar(lexicalXSDDate).toGregorianCalendar();
+return getDatatypeFactory().newXMLGregorianCalendar(lexicalXSDDate).toGregorianCalendar();
 }
 @Deprecated
 public String printDate(Calendar val) {
 return _printDate(val);

Mercurial > jdk8-mips64-public > jaxws / file comparison

comparison: src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java

src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java