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

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, 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 @@ -36,7 +36,6 @@
    1.11  import javax.xml.soap.SOAPException;
    1.12  import javax.xml.soap.SOAPFault;
    1.13  import javax.xml.ws.WebServiceException;
    1.14 -import javax.xml.ws.soap.SOAPFaultException;
    1.15  import java.util.Iterator;
    1.16  
    1.17  /**
    1.18 @@ -102,12 +101,13 @@
    1.19          this.faultstring = reason;
    1.20          this.faultactor = actor;
    1.21          if (detailObject != null) {
    1.22 -            if("".equals(detailObject.getNamespaceURI()) && "detail".equals(detailObject.getLocalName())){
    1.23 +            if ((detailObject.getNamespaceURI() == null ||
    1.24 +                 "".equals(detailObject.getNamespaceURI())) && "detail".equals(detailObject.getLocalName())) {
    1.25                  detail = new DetailType();
    1.26 -                for(Element detailEntry : DOMUtil.getChildElements(detailObject)){
    1.27 +                for(Element detailEntry : DOMUtil.getChildElements(detailObject)) {
    1.28                      detail.getDetails().add(detailEntry);
    1.29                  }
    1.30 -            }else{
    1.31 +            } else {
    1.32                  detail = new DetailType(detailObject);
    1.33              }
    1.34          }