Author: veithen
Date: Sat Dec 3 09:57:08 2011
New Revision: 1209875
URL: http://svn.apache.org/viewvc?rev=1209875&view=rev
Log:
AXIOM-377: Make sure that DataSource instances for a MIME part return
consistent content types.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java?rev=1209875&r1=1209874&r2=1209875&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java
Sat Dec 3 09:57:08 2011
@@ -32,8 +32,7 @@ class PartDataSource implements SizeAwar
}
public String getContentType() {
- String ct = part.getContentType();
- return ct == null ? "application/octet-stream" : ct;
+ return part.getDataSourceContentType();
}
public InputStream getInputStream() throws IOException {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java?rev=1209875&r1=1209874&r2=1209875&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
Sat Dec 3 09:57:08 2011
@@ -124,6 +124,17 @@ final class PartImpl implements Part {
}
/**
+ * Get the content type that should be reported by {@link DataSource}
instances created for this
+ * part.
+ *
+ * @return the content type
+ */
+ String getDataSourceContentType() {
+ String ct = getContentType();
+ return ct == null ? "application/octet-stream" : ct;
+ }
+
+ /**
* @return contentTransferEncoding
* @throws MessagingException
*/
@@ -258,7 +269,7 @@ final class PartImpl implements Part {
}
DataSource getDataSource() {
- return getContent().getDataSource(getContentType());
+ return getContent().getDataSource(getDataSourceContentType());
}
void writeTo(OutputStream out) throws IOException {
