Author: dims
Date: Fri Apr 13 07:01:32 2007
New Revision: 528489
URL: http://svn.apache.org/viewvc?view=rev&rev=528489
Log:
avoid NPE - merge from trunk
Modified:
webservices/axis2/branches/java/1_2/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
Modified:
webservices/axis2/branches/java/1_2/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java?view=diff&rev=528489&r1=528488&r2=528489
==============================================================================
---
webservices/axis2/branches/java/1_2/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
(original)
+++
webservices/axis2/branches/java/1_2/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
Fri Apr 13 07:01:32 2007
@@ -62,9 +62,11 @@
Map props = axisMsgContext.getOptions().getProperties();
soapMessageContext.putAll(props);
+ EndpointDescription description =
jaxwsMessageContext.getEndpointDescription();
+ if (description !=null) {
// Set the WSDL properties
ServiceDescription sd =
-
jaxwsMessageContext.getEndpointDescription().getServiceDescription();
+ description.getServiceDescription();
if (sd != null) {
URL wsdlLocation = ((ServiceDescriptionWSDL)sd).getWSDLLocation();
if (wsdlLocation != null && !"".equals(wsdlLocation)) {
@@ -89,6 +91,7 @@
.setScope(javax.xml.ws.handler.MessageContext.WSDL_SERVICE, Scope.APPLICATION);
if (log.isDebugEnabled()) {
log.debug("WSDL_SERVICE :" + sd.getServiceQName());
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
