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 di...@apache.org on 2003/06/29 17:02:50 UTC
cvs commit: xml-axis/java/src/org/apache/axis/wsdl/toJava Utils.java
dims 2003/06/29 08:02:50
Modified: java/src/org/apache/axis/utils JavaUtils.java
java/src/org/apache/axis/wsdl/toJava Utils.java
Log:
Fix for Bug 18205 - WSDL type mapping broken for non-built-in MIME type attachments
from gary.gordon@softwareagusa.com (Gary Gordon)
Notes:
- i did not see the "generated stub
containing a no-arg constructor for DataHandler (which doesn't exist)" problem mentioned in the bug report.
Revision Changes Path
1.100 +1 -1 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- JavaUtils.java 22 Apr 2003 19:36:04 -0000 1.99
+++ JavaUtils.java 29 Jun 2003 15:02:50 -0000 1.100
@@ -1158,7 +1158,7 @@
return "javax.mail.internet.MimeMultipart";
}
else {
- return null;
+ return "javax.activation.DataHandler";
}
} // mimeToJava
1.76 +5 -4 xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Utils.java 22 Apr 2003 19:36:27 -0000 1.75
+++ Utils.java 29 Jun 2003 15:02:50 -0000 1.76
@@ -120,6 +120,8 @@
else if (mimeType.equals("text/xml") ||
mimeType.equals("application/xml")) {
return "org.apache.axis.holders.SourceHolder" + mimeDimensions;
+ } else {
+ return "org.apache.axis.holders.DataHandlerHolder" + mimeDimensions;
}
}
@@ -587,10 +589,9 @@
return "(org.apache.axis.attachments.OctetStream" + mimeDimensions + ") " + var + ";";
}
else {
- return "(" + type.getName() + ") " + var + ";";
+ return "(javax.activation.DataHandler" + mimeDimensions + ") " + var + ";";
}
- }
- else {
+ } else {
String objType = (String) TYPES.get(type.getName());
if (objType != null) {
return "((" + objType + ") " + var + ")." + type.getName() + "Value();";
@@ -799,7 +800,7 @@
return Constants.MIME_MULTIPART;
}
else {
- return null;
+ return Constants.MIME_DATA_HANDLER;
}
} // getMIMEType