Author: darran.lofthouse(a)jboss.com Date: 2010-02-25 08:38:26 -0500 (Thu, 25 Feb 2010) New Revision: 11688 Modified: stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java Log: Some intermediate code Modified: stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2010-02-25 10:22:44 UTC (rev 11687) +++ stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2010-02-25 13:38:26 UTC (rev 11688) @@ -133,9 +133,13 @@ } // Delegate to JBoss Entity Resolver - XMLInputSource source = getXMLInputSource(delegate.resolveEntity(null, namespaceURI), resId); - if (source != null) - return source; + InputSource is = delegate.resolveEntity(null, namespaceURI); + if (is != null) + { + XMLInputSource source = getXMLInputSource(is, resId); + if (source != null) + return source; + } } catch (SAXException e) { Modified: stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2010-02-25 10:22:44 UTC (rev 11687) +++ stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2010-02-25 13:38:26 UTC (rev 11688) @@ -507,15 +507,16 @@ private JBossXSNamespaceItem createNamespaceItemIfNotExistent(String ns) { - if (ns == null) - throw new IllegalArgumentException("Illegal null argument:ns"); + //if (ns == null) + // throw new IllegalArgumentException("Illegal null argument:ns"); JBossXSNamespaceItem jbnm = nsimap.get(ns); if (jbnm == null) { jbnm = new JBossXSNamespaceItem(ns, namespaceRegistry, qualifiedElements); nsimap.put(ns, jbnm); - registerNamespace(ns); + if (ns != null) + registerNamespace(ns); } return jbnm;