Author: veithen
Date: Wed Dec 29 21:02:56 2010
New Revision: 1053733
URL: http://svn.apache.org/viewvc?rev=1053733&view=rev
Log:
Removed some dead code. isOptimized() and isDoingSWA() can never return true
simultaneously.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java?rev=1053733&r1=1053732&r2=1053733&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
Wed Dec 29 21:02:56 2010
@@ -197,14 +197,7 @@ public class OMOutputFormat {
// If MTOM or SWA, the returned content-type is an
// appropriate multipart/related content type.
if (isOptimized()) {
- if (isDoingSWA()) {
- // If both optimized and SWA, then prefer SWA
- // for the content type
- ct = this.getContentTypeForSwA(contentType);
- } else {
- // Optimized without SWA is MTOM
- ct = this.getContentTypeForMTOM(contentType);
- }
+ ct = this.getContentTypeForMTOM(contentType);
} else if (isDoingSWA()) {
ct = this.getContentTypeForSwA(contentType);
} else {
