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 ru...@apache.org on 2002/09/04 23:48:16 UTC
cvs commit: xml-axis/java/src/org/apache/axis/utils NSStack.java
rubys 2002/09/04 14:48:16
Modified: java/src/org/apache/axis/encoding
DeserializationContext.java
DeserializationContextImpl.java
java/src/org/apache/axis/utils NSStack.java
Log:
Reduce cloning
Revision Changes Path
1.50 +1 -1 xml-axis/java/src/org/apache/axis/encoding/DeserializationContext.java
Index: DeserializationContext.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContext.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- DeserializationContext.java 24 Aug 2002 01:25:19 -0000 1.49
+++ DeserializationContext.java 4 Sep 2002 21:48:15 -0000 1.50
@@ -125,7 +125,7 @@
public void setRecorder(SAX2EventRecorder recorder);
/**
- * Get the Namespace Mappings
+ * Get the Namespace Mappings. Returns null if none are present.
**/
public ArrayList getCurrentNSMappings();
1.57 +1 -1 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- DeserializationContextImpl.java 29 Aug 2002 21:02:39 -0000 1.56
+++ DeserializationContextImpl.java 4 Sep 2002 21:48:15 -0000 1.57
@@ -281,7 +281,7 @@
}
/**
- * Get the Namespace Mappings
+ * Get the Namespace Mappings. Returns null if none are present.
**/
public ArrayList getCurrentNSMappings()
{
1.30 +3 -1 xml-axis/java/src/org/apache/axis/utils/NSStack.java
Index: NSStack.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/NSStack.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- NSStack.java 4 Sep 2002 20:15:10 -0000 1.29
+++ NSStack.java 4 Sep 2002 21:48:16 -0000 1.30
@@ -135,9 +135,11 @@
}
/**
- * Return a copy of the current frame.
+ * Return a copy of the current frame. Returns null if none are present.
*/
public ArrayList cloneFrame() {
+ if (stack[top] == null) return null;
+
ArrayList clone = new ArrayList();
for (Mapping map=topOfFrame(); map!=null; map=next()) {