[jboss-cvs] JBossAS SVN: r57888 - branches/JEE5_TCK/server/src/main/org/jboss/webservice/metadata/serviceref

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-10-27 03:49:47 -0400 (Fri, 27 Oct 2006)
New Revision: 57888

Modified:
   branches/JEE5_TCK/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
Log:
Prevent NPE on missing DOCTYPE

Modified: branches/JEE5_TCK/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java
===================================================================
--- branches/JEE5_TCK/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java	2006-10-27 06:36:36 UTC (rev 57887)
+++ branches/JEE5_TCK/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java	2006-10-27 07:49:47 UTC (rev 57888)
@@ -32,14 +32,10 @@
 import java.util.LinkedHashMap;
 import java.util.Properties;
 
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
 import javax.xml.namespace.QName;
-import javax.xml.rpc.JAXRPCException;
 
 import org.jboss.deployment.DeploymentException;
 import org.jboss.logging.Logger;
-import org.jboss.metadata.ClientMetaData;
 import org.jboss.metadata.MetaData;
 import org.jboss.xb.QNameBuilder;
 import org.w3c.dom.DocumentType;
@@ -219,11 +215,16 @@
    public static boolean isValidDoctype(Element element)
    {
       DocumentType doctype = element.getOwnerDocument().getDoctype();
-      String publicId = doctype.getPublicId();
-      boolean isValid = "-//JBoss//DTD JBOSS 4.0//EN".equals(publicId);
-      isValid |= "-//JBoss//DTD Web Application 2.4//EN".equals(publicId);
-      isValid |= "-//JBoss//DTD Application Client 4.0//EN".equals(publicId);
-      log.debug("Skip <service-ref> for invalid public id: " + publicId);
+      boolean isValid = false;
+      if (doctype != null)
+      {
+         String publicId = doctype.getPublicId();
+         isValid |= "-//JBoss//DTD JBOSS 4.0//EN".equals(publicId);
+         isValid |= "-//JBoss//DTD Web Application 2.4//EN".equals(publicId);
+         isValid |= "-//JBoss//DTD Application Client 4.0//EN".equals(publicId);
+      }
+      String toString = (doctype != null ? "[public=" + doctype.getPublicId() + ",system=" + doctype.getSystemId() + "]" : null);
+      log.debug("Skip <service-ref> for doctype: " + toString);
       return isValid;
    }