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

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java	Tue Feb 11 14:35:59 2014 -0800
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java	Fri Feb 14 10:53:55 2014 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -63,9 +63,7 @@
    1.11  import javax.imageio.stream.ImageOutputStream;
    1.12  import javax.xml.bind.ValidationEvent;
    1.13  import javax.xml.bind.helpers.ValidationEventImpl;
    1.14 -import javax.xml.datatype.DatatypeConfigurationException;
    1.15  import javax.xml.datatype.DatatypeConstants;
    1.16 -import javax.xml.datatype.DatatypeFactory;
    1.17  import javax.xml.datatype.Duration;
    1.18  import javax.xml.datatype.XMLGregorianCalendar;
    1.19  import javax.xml.namespace.QName;
    1.20 @@ -568,7 +566,8 @@
    1.21  
    1.22                  public XMLGregorianCalendar parse(CharSequence lexical) throws SAXException {
    1.23                      try {
    1.24 -                        return datatypeFactory.newXMLGregorianCalendar(lexical.toString().trim()); // (.trim() - issue 396)
    1.25 +                        return DatatypeConverterImpl.getDatatypeFactory()
    1.26 +                                .newXMLGregorianCalendar(lexical.toString().trim()); // (.trim() - issue 396)
    1.27                      } catch (Exception e) {
    1.28                          UnmarshallingContext.getInstance().handleError(e);
    1.29                          return null;
    1.30 @@ -838,7 +837,7 @@
    1.31  
    1.32                  public Duration parse(CharSequence lexical) {
    1.33                      TODO.checkSpec("JSR222 Issue #42");
    1.34 -                    return datatypeFactory.newDuration(lexical.toString());
    1.35 +                    return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString());
    1.36                  }
    1.37              });
    1.38          primaryList.add(
    1.39 @@ -879,21 +878,6 @@
    1.40          }
    1.41      }
    1.42  
    1.43 -
    1.44 -    /**
    1.45 -     * Cached instance of {@link DatatypeFactory} to create
    1.46 -     * {@link XMLGregorianCalendar} and {@link Duration}.
    1.47 -     */
    1.48 -    private static final DatatypeFactory datatypeFactory = init();
    1.49 -
    1.50 -    private static DatatypeFactory init() {
    1.51 -        try {
    1.52 -            return DatatypeFactory.newInstance();
    1.53 -        } catch (DatatypeConfigurationException e) {
    1.54 -            throw new Error(Messages.FAILED_TO_INITIALE_DATATYPE_FACTORY.format(),e);
    1.55 -        }
    1.56 -    }
    1.57 -
    1.58          private static void checkXmlGregorianCalendarFieldRef(QName type,
    1.59                  XMLGregorianCalendar cal)throws javax.xml.bind.MarshalException{
    1.60                  StringBuilder buf = new StringBuilder();