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 gd...@apache.org on 2002/07/23 14:54:02 UTC
cvs commit: xml-axis/java/test/wsdl/extensibility ExtensibilityQueryBindingImpl.java ExtensibilityQueryTestCase.java
gdaniels 2002/07/23 05:54:02
Modified: java/src/org/apache/axis/encoding/ser BeanDeserializer.java
java/test/wsdl/extensibility
ExtensibilityQueryBindingImpl.java
ExtensibilityQueryTestCase.java
Log:
Remove DESERIALIZE_ANY flag. Always support this.
Revision Changes Path
1.40 +1 -7 xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
Index: BeanDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- BeanDeserializer.java 22 Jul 2002 14:54:47 -0000 1.39
+++ BeanDeserializer.java 23 Jul 2002 12:54:01 -0000 1.40
@@ -97,8 +97,6 @@
protected Map propertyMap = null;
protected QName prevQName;
- public static final String DESERIALIZE_ANY = "DeserializeAny";
-
/** Type metadata about this class for XML deserialization */
protected TypeDesc typeDesc = null;
@@ -233,11 +231,7 @@
// try to put unknown elements into an Object property
propDesc = getObjectPropertyDesc(elemQName, context);
if (propDesc != null) {
- //Boolean deserializeAny = (Boolean) messageContext.getProperty(DESERIALIZE_ANY);
- Boolean deserializeAny = Boolean.TRUE;
- if ((deserializeAny != null) && (deserializeAny.booleanValue())) {
- dSer = context.getDeserializerForType(elemQName);
- }
+ dSer = context.getDeserializerForType(elemQName);
if (dSer == null) {
qn = Constants.XSD_ANY;
// make sure that the Element Deserializer deserializes the current element and not the child
1.12 +0 -1 xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java
Index: ExtensibilityQueryBindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExtensibilityQueryBindingImpl.java 22 Jul 2002 06:23:02 -0000 1.11
+++ ExtensibilityQueryBindingImpl.java 23 Jul 2002 12:54:01 -0000 1.12
@@ -98,7 +98,6 @@
String messageString = stringWriter.getBuffer().toString();
logger.debug(messageString);
Reader reader = new StringReader(messageString);
- messageContext.setProperty(BeanDeserializer.DESERIALIZE_ANY, Boolean.TRUE);
DeserializationContext deserializer = new DeserializationContextImpl(new InputSource(reader),
messageContext,
Message.REQUEST);
1.8 +0 -1 xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java
Index: ExtensibilityQueryTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExtensibilityQueryTestCase.java 22 Jul 2002 06:23:02 -0000 1.7
+++ ExtensibilityQueryTestCase.java 23 Jul 2002 12:54:01 -0000 1.8
@@ -47,7 +47,6 @@
book.setSubject("all");
bookQuery.setBookQuery(book);
expression.setAny(bookQuery);
- ((Stub)binding)._setProperty(BeanDeserializer.DESERIALIZE_ANY, Boolean.TRUE);
ExtensibilityType any = binding.query(expression);
ResultListType result = (ResultListType) any.getAny();
QueryResultType[] queryResult = result.getResult();