cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1177247 - /cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
Date Thu, 29 Sep 2011 10:00:56 GMT
Author: ema
Date: Thu Sep 29 10:00:56 2011
New Revision: 1177247

URL: http://svn.apache.org/viewvc?rev=1177247&view=rev
Log:
[CXF-1519]:Fix jdk15 build

Modified:
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java?rev=1177247&r1=1177246&r2=1177247&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
(original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
Thu Sep 29 10:00:56 2011
@@ -43,6 +43,7 @@ import org.apache.cxf.common.WSDLConstan
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ReflectionInvokationHandler;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.xmlschema.SchemaCollection;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.service.ServiceModelVisitor;
@@ -462,7 +463,7 @@ class JAXBSchemaInitializer extends Serv
         XmlType xmlTypeAnno = cls.getAnnotation(XmlType.class);
         boolean respectXmlTypeNS = false;
         XmlSchema faultBeanSchema = null;
-        if (xmlTypeAnno != null && !xmlTypeAnno.namespace().isEmpty() 
+        if (xmlTypeAnno != null && !StringUtils.isEmpty(xmlTypeAnno.namespace())

             && !xmlTypeAnno.namespace().equals(part.getElementQName().getNamespaceURI()))
{
             respectXmlTypeNS = true;
             NamespaceMap nsMap = new NamespaceMap();
@@ -487,7 +488,7 @@ class JAXBSchemaInitializer extends Serv
         // Before updating everything, make sure we haven't added this
         // type yet.  Multiple methods that throw the same exception
         // types will cause duplicates.
-        String faultTypeName = xmlTypeAnno != null && !xmlTypeAnno.name().isEmpty()
? xmlTypeAnno.name() 
+        String faultTypeName = xmlTypeAnno != null && !StringUtils.isEmpty(xmlTypeAnno.name())
? xmlTypeAnno.name() 
             :  part.getElementQName().getLocalPart();
         XmlSchemaType existingType = schema.getTypeByName(faultTypeName);
         if (existingType != null) {



Mime
View raw message