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

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java	Mon Sep 29 11:50:34 2014 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java	Sun Aug 31 16:14:36 2014 +0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, 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 @@ -49,18 +49,17 @@
    1.11  
    1.12      public void text(UnmarshallingContext.State state, CharSequence text) throws SAXException {
    1.13          try {
    1.14 -            xacc.parse(state.target,text);
    1.15 +            xacc.parse(state.getTarget(),text);
    1.16          } catch (AccessorException e) {
    1.17              handleGenericException(e,true);
    1.18          } catch (RuntimeException e) {
    1.19 -            if(state.prev != null) {
    1.20 -                if(state.prev.target instanceof JAXBElement) {
    1.21 -                    ; // do nothing - issue 601 - don't report exceptions like
    1.22 -                      // NumberFormatException when unmarshalling "nillable" element
    1.23 -                      // (I suppose JAXBElement indicates this
    1.24 -                } else {
    1.25 +            if(state.getPrev() != null) {
    1.26 +                if (!(state.getPrev().getTarget() instanceof JAXBElement))
    1.27                      handleParseConversionException(state,e);
    1.28 -                }
    1.29 +                // else
    1.30 +                // do nothing - issue 601 - don't report exceptions like
    1.31 +                // NumberFormatException when unmarshalling "nillable" element
    1.32 +                // (I suppose JAXBElement indicates this
    1.33              } else {
    1.34                  handleParseConversionException(state,e);
    1.35              }