You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/12/04 00:48:05 UTC

svn commit: r723150 - in /geronimo/server/trunk/plugins: cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java

Author: gawor
Date: Wed Dec  3 15:48:05 2008
New Revision: 723150

URL: http://svn.apache.org/viewvc?rev=723150&view=rev
Log:
override mtom setting only when it is explicitly set in the DD

Modified:
    geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?rev=723150&r1=723149&r2=723150&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java Wed Dec  3 15:48:05 2008
@@ -171,7 +171,7 @@
 
         org.apache.cxf.endpoint.Endpoint endpoint = getEndpoint();
 
-        if (getBinding() instanceof SOAPBinding) {
+        if (getBinding() instanceof SOAPBinding && this.portInfo.isMTOMEnabled() != null) {
             ((SOAPBinding)getBinding()).setMTOMEnabled(this.portInfo.isMTOMEnabled());
         }
         

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java?rev=723150&r1=723149&r2=723150&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/PortInfo.java Wed Dec  3 15:48:05 2008
@@ -38,7 +38,7 @@
 
     private String handlersAsXML;
 
-    private boolean mtomEnabled;
+    private Boolean mtomEnabled;
 
     private String binding;
     
@@ -88,11 +88,11 @@
         serviceName = sn;
     }
 
-    public void setEnableMTOM(boolean mtomEnabled) {
+    public void setEnableMTOM(Boolean mtomEnabled) {
         this.mtomEnabled = mtomEnabled;
     }
 
-    public boolean isMTOMEnabled() {
+    public Boolean isMTOMEnabled() {
         return this.mtomEnabled;
     }