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

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java	Mon Sep 29 11:50:34 2014 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java	Sun Aug 31 16:14:36 2014 +0400
     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 @@ -144,17 +144,7 @@
    1.11          if( qname==null || qname.length()==0 )
    1.12              qname=local;
    1.13  
    1.14 -
    1.15 -        boolean ignorable = true;
    1.16 -        StructureLoader sl;
    1.17 -
    1.18 -        // not null only if element content is processed (StructureLoader is used)
    1.19 -        // ugly
    1.20 -        if((sl = this.context.getStructureLoader()) != null) {
    1.21 -            ignorable = ((ClassBeanInfoImpl)sl.getBeanInfo()).hasElementOnlyContentModel();
    1.22 -        }
    1.23 -
    1.24 -        processText(ignorable);
    1.25 +        processText(!context.getCurrentState().isMixed());
    1.26  
    1.27          tagName.uri = uri;
    1.28          tagName.local = local;
    1.29 @@ -204,7 +194,7 @@
    1.30      }
    1.31  
    1.32      private void processText( boolean ignorable ) throws SAXException {
    1.33 -        if( predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer)))
    1.34 +        if (predictor.expectText() && (!ignorable || !WhiteSpaceProcessor.isWhiteSpace(buffer)))
    1.35              next.text(buffer);
    1.36          buffer.setLength(0);
    1.37      }