Author: dkulp Date: Tue Mar 10 20:29:51 2009 New Revision: 752245 URL: http://svn.apache.org/viewvc?rev=752245&view=rev Log: Fix compile error
Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java?rev=752245&r1=752244&r2=752245&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java (original) +++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/DataReaderImpl.java Tue Mar 10 20:29:51 2009 @@ -31,7 +31,6 @@ import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.databinding.DataReader; -import org.apache.cxf.databinding.DataReaderValidation2; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Attachment; import org.apache.cxf.service.model.MessagePartInfo; @@ -42,9 +41,9 @@ import org.apache.xmlbeans.XmlOptions; -public class DataReaderImpl implements DataReader<XMLStreamReader> , DataReaderValidation2 { +public class DataReaderImpl implements DataReader<XMLStreamReader> { private static final Logger LOG = LogUtils.getLogger(XmlBeansDataBinding.class); - private XmlSchemaCollection schemas; + private boolean validate; public DataReaderImpl() { } @@ -74,7 +73,7 @@ SchemaType st = (SchemaType)part.getProperty(SchemaType.class.getName()); XmlOptions options = new XmlOptions(); - if (schemas != null) { + if (validate) { options.setValidateOnSet(); } if (st != null && !st.isDocumentType() && !isOutClass) { @@ -143,10 +142,11 @@ } public void setSchema(Schema s) { + validate = s != null; } public void setSchema(XmlSchemaCollection validationSchemas) { - this.schemas = validationSchemas; + validate = validationSchemas != null; } }