This seems to be a fairly safe fix and brings back functionality we had in
B3 and before.
Rick Rineholt
"The truth is out there... All you need is a better search engine!"
[EMAIL PROTECTED]
---------------------- Forwarded by Rick Rineholt/Raleigh/IBM on 10/01/2002
11:10 AM ---------------------------
[EMAIL PROTECTED] on 09/30/2002 04:05:24 PM
Please respond to [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
cc:
Subject: cvs commit: xml-axis/java/src/org/apache/axis/encoding/ser
ArraySerializer.java
rineholt 2002/09/30 13:05:24
Modified: java/src/org/apache/axis/encoding SerializationContext.java
SerializationContextImpl.java
java/src/org/apache/axis/encoding/ser ArraySerializer.java
Log:
Bug 13115
Revision Changes Path
1.83 +0 -15
xml-axis/java/src/org/apache/axis/encoding/SerializationContext.java
Index: SerializationContext.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContext.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- SerializationContext.java 5 Sep 2002 01:08:37 -0000 1.82
+++ SerializationContext.java 30 Sep 2002 20:05:23 -0000 1.83
@@ -123,21 +123,6 @@
Boolean sendType)
throws IOException;
- /**
- * Invoked to do the actual serialization of the qName (called by
serialize above).
- * additional attributes that will be serialized with the qName.
- * @param elemQName is the QName of the element
- * @param attributes are additional attributes
- * @param value is the object to serialize
- * @param xmlType (optional) is the desired type QName.
- * @param sendType indicates whether the xsi:type attribute should
be set.
- */
- public void serializeActual(QName elemQName,
- Attributes attributes,
- Object value,
- QName xmlType,
- Boolean sendType)
- throws IOException;
/**
* Obtains the type attribute that should be serialized and returns
the new list of Attributes
1.77 +2 -2
xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
Index: SerializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- SerializationContextImpl.java 29 Sep 2002 19:35:52 -0000 1.76
+++ SerializationContextImpl.java 30 Sep 2002 20:05:23 -0000 1.77
@@ -1168,7 +1168,7 @@
* @param xmlType (optional) is the desired type QName.
* @param sendType indicates whether the xsi:type attribute should
be set.
*/
- public void serializeActual(QName elemQName,
+ private void serializeActual(QName elemQName,
Attributes attributes,
Object value,
QName xmlType,
@@ -1195,7 +1195,7 @@
currentXMLType = xmlType;
// if we're looking for xsd:anyType, accept anything...
- if (Constants.XSD_ANYTYPE.equals(xmlType)) {
+ if (Constants.equals(Constants.XSD_ANYTYPE,xmlType)){
xmlType = null;
shouldSendType = true;
}
1.37 +3 -5
xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java
Index: ArraySerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArraySerializer.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ArraySerializer.java 25 Sep 2002 03:21:08 -0000 1.36
+++ ArraySerializer.java 30 Sep 2002 20:05:24 -0000 1.37
@@ -223,12 +223,10 @@
// actual schema array or for a maxOccurs usage.
// For the maxOccurs case, the currentXMLType of the context is
// the same as the componentQName.
- boolean maxOccursUsage =
componentQName.equals(context.getCurrentXMLType());
+ boolean maxOccursUsage = !context.getMessageContext().isEncoded
() &&
+
componentQName.equals(context.getCurrentXMLType());
- // Are we encoded?
- boolean isEncoded = context.getMessageContext().isEncoded();
-
- if (isEncoded && !maxOccursUsage) {
+ if (!maxOccursUsage) {
AttributesImpl attrs;
if (attributes == null) {
attrs = new AttributesImpl();
