You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by am...@apache.org on 2007/07/18 06:47:49 UTC
svn commit: r557147 - in
/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils:
ConverterUtil.java reader/ADBXMLStreamReaderImpl.java
Author: amilas
Date: Tue Jul 17 21:47:48 2007
New Revision: 557147
URL: http://svn.apache.org/viewvc?view=rev&rev=557147
Log:
fixed the issue AXIS2-2922
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?view=diff&rev=557147&r1=557146&r2=557147
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java Tue Jul 17 21:47:48 2007
@@ -33,6 +33,7 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Array;
@@ -1023,5 +1024,21 @@
super(message, cause);
}
+ }
+
+ // serialization methods for xsd any type
+
+ /**
+ * serialize the any type string object
+ * @param string
+ * @param xmlStreamWriter
+ */
+ public static void serializeAnyType(String string, XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+ if (xmlStreamWriter.getPrefix(Constants.XSI_NAMESPACE) == null){
+ String prefix = BeanUtil.getUniquePrefix();
+ xmlStreamWriter.writeNamespace(prefix,Constants.XSI_NAMESPACE);
+ xmlStreamWriter.setPrefix(prefix,Constants.XSI_NAMESPACE);
+ }
+
}
}
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=557147&r1=557146&r2=557147
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java Tue Jul 17 21:47:48 2007
@@ -24,6 +24,7 @@
import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axis2.databinding.ADBBean;
import org.apache.axis2.databinding.utils.BeanUtil;
+import org.apache.axis2.databinding.utils.ConverterUtil;
import org.apache.axis2.description.java2wsdl.TypeTable;
import javax.activation.DataHandler;
@@ -576,7 +577,12 @@
if (state == DELEGATED_STATE) {
return childReader.getText();
} else if (state == TEXT_STATE) {
- return (String)properties[currentPropertyIndex - 1];
+ Object property = properties[currentPropertyIndex - 1];
+ if (property instanceof DataHandler){
+ return ConverterUtil.getStringFromDatahandler((DataHandler)property);
+ } else {
+ return (String)properties[currentPropertyIndex - 1];
+ }
} else {
throw new IllegalStateException();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org