You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ga...@apache.org on 2008/09/30 21:29:26 UTC
svn commit: r700561 - in
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws:
binding/BindingUtils.java server/dispatcher/JavaBeanDispatcher.java
Author: gawor
Date: Tue Sep 30 12:29:25 2008
New Revision: 700561
URL: http://svn.apache.org/viewvc?rev=700561&view=rev
Log:
remove old/unused function, catch NPE and reuse some code
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingUtils.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingUtils.java?rev=700561&r1=700560&r2=700561&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingUtils.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingUtils.java Tue Sep 30 12:29:25 2008
@@ -33,7 +33,7 @@
*/
public static Binding createBinding(EndpointDescription ed) {
if (ed == null) {
- // Do we default to the SOAPBinding?
+ throw new NullPointerException("EndpointDescription is null");
}
String bindingType =
@@ -55,17 +55,7 @@
}
public static boolean isSOAPBinding(String url) {
- if (url != null && (url.equals(SOAPBinding.SOAP11HTTP_BINDING) ||
- url.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) ||
- url.equals(SOAPBinding.SOAP12HTTP_BINDING)||
- url.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING) ||
- url.equals(MDQConstants.SOAP11JMS_BINDING) ||
- url.equals(MDQConstants.SOAP11JMS_MTOM_BINDING) ||
- url.equals(MDQConstants.SOAP12JMS_BINDING) ||
- url.equals(MDQConstants.SOAP12JMS_MTOM_BINDING) )) {
- return true;
- }
- return false;
+ return (isSOAP11Binding(url) || isSOAP12Binding(url));
}
public static boolean isSOAP11Binding(String url) {
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java?rev=700561&r1=700560&r2=700561&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java Tue Sep 30 12:29:25 2008
@@ -205,13 +205,6 @@
return;
}
-
- protected Object invokeService(MessageContext ctx,
- Method method,
- Object obj,
- Object args[]) throws Exception {
- return method.invoke(obj, args);
- }
private void initialize(MessageContext mc) {
mc.setOperationName(mc.getAxisMessageContext().getAxisOperation().getName());