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/08/23 20:31:26 UTC
cvs commit: xml-axis/java/src/org/apache/axis/encoding DeserializationContextImpl.java
gdaniels 2002/08/23 11:31:26
Modified: java/src/org/apache/axis/encoding
DeserializationContextImpl.java
Log:
Back out namespaces.pop() for the nonce, and make it possible
to pass a generic SOAPHandler as the initialHandler.
Revision Changes Path
1.51 +8 -6 xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- DeserializationContextImpl.java 23 Aug 2002 15:08:56 -0000 1.50
+++ DeserializationContextImpl.java 23 Aug 2002 18:31:26 -0000 1.51
@@ -89,7 +89,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Stack;
/**
* @author Glen Daniels (gdaniels@macromedia.com)
@@ -138,7 +137,7 @@
* @param initialHandler is the EnvelopeBuilder handler
*/
public DeserializationContextImpl(MessageContext ctx,
- EnvelopeBuilder initialHandler)
+ SOAPHandler initialHandler)
{
msgContext = ctx;
@@ -146,9 +145,11 @@
if (ctx == null || ctx.isHighFidelity())
recorder = new SAX2EventRecorder();
- envelope = initialHandler.getEnvelope();
- envelope.setRecorder(recorder);
-
+ if (initialHandler instanceof EnvelopeBuilder) {
+ envelope = ((EnvelopeBuilder)initialHandler).getEnvelope();
+ envelope.setRecorder(recorder);
+ }
+
pushElementHandler(new EnvelopeHandler(initialHandler));
}
@@ -931,7 +932,8 @@
if (curElement != null)
curElement = (MessageElement)curElement.getParentElement();
- namespaces.pop();
+ // This breaks the types.VerifyTestCase for some reason....
+ // namespaces.pop();
if (log.isDebugEnabled()) {
String name = curElement != null ?