svn commit: r508178 - in /webservices/axis2/trunk/java/modules: jaxws/src/org/apache/axis2/jaxws/BindingProvider.java metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java

[ba...@apache.org]

Author: barrettj
Date: Thu Feb 15 13:54:41 2007
New Revision: 508178

URL: http://svn.apache.org/viewvc?view=rev&rev=508178
Log:
Change BindingProvider to always use the Client bindingType ID.  Previously it incorrectly tried to use the service-side
bindingType based on incorrect comments in the EndpointDescription interface (fixed those too).

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
    webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java?view=diff&rev=508178&r1=508177&r2=508178
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java Thu Feb 15 13:54:41 2007
@@ -78,10 +78,7 @@
         
         // The default Binding is the SOAPBinding
         if (binding == null) {
-            String bindingType = endpointDesc.getBindingType();
-            if (bindingType == null) { // we must be on the client
-                bindingType = endpointDesc.getClientBindingID();
-            }
+            String bindingType = endpointDesc.getClientBindingID();
             binding = new SOAPBinding(bindingType);
         }
         return binding;

Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java?view=diff&rev=508178&r1=508177&r2=508178
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java Thu Feb 15 13:54:41 2007
@@ -85,7 +85,9 @@
     public abstract String getTargetNamespace();
     /**
      * Returns the binding type FOR A SERVER.  This is based on the BindingType annotation and/or the WSDL.
-     * This will return NULL if called on a client.
+     * This will return the default binding (SOAP11) if no annotation was specified on the server.
+     * This should NOT be called on the client since it will always return the default binding.  
+     * Use getClientBindingID() on clients.  
      * @return
      */
     public abstract String getBindingType();
@@ -96,7 +98,8 @@
      */
     public abstract void setClientBindingID(String clientBindingID);
     /**
-     * Return the binding type FOR A CLIENT.  This will return NULL if called on the server.
+     * Return the binding type FOR A CLIENT.  This will return the default client binding type
+     * if called on the server.  Use getBindingType() on servers.
      * @see setClientBindingID();
      * @return String representing the client binding type
      */



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org