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 pr...@apache.org on 2008/03/17 18:08:15 UTC
svn commit: r637972 - in
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws:
addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java
addressing/util/EndpointKey.java framework/JAXWSDeployer.java
Author: pradine
Date: Mon Mar 17 10:08:11 2008
New Revision: 637972
URL: http://svn.apache.org/viewvc?rev=637972&view=rev
Log:
Fix for AXIS2-3617.
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/util/EndpointKey.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java?rev=637972&r1=637971&r2=637972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java Mon Mar 17 10:08:11 2008
@@ -20,6 +20,7 @@
package org.apache.axis2.jaxws.addressing.factory.impl;
import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.description.AxisService;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.addressing.factory.Axis2EndpointReferenceFactory;
import org.apache.axis2.jaxws.addressing.util.EndpointContextMap;
@@ -59,7 +60,19 @@
public EndpointReference createEndpointReference(QName serviceName, QName endpoint) {
EndpointKey key = new EndpointKey(serviceName, endpoint);
EndpointContextMap map = EndpointContextMapManager.getEndpointContextMap();
- String address = (String) map.get(key);
+
+ if (!map.containsKey(key))
+ throw new IllegalStateException("Unable to locate a deployed service that maps to the requested endpoint, " + key);
+
+ AxisService axisService = (AxisService) map.get(key);
+ String address = null;
+
+ try {
+ address = axisService.getEPRs()[0];
+ }
+ catch (Exception e) {
+ //do nothing
+ }
return createEndpointReference(address);
}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/util/EndpointKey.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/util/EndpointKey.java?rev=637972&r1=637971&r2=637972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/util/EndpointKey.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/addressing/util/EndpointKey.java Mon Mar 17 10:08:11 2008
@@ -84,5 +84,16 @@
result = PRIME * result + ((endpoint == null) ? 0 : endpoint.hashCode());
result = PRIME * result + ((service == null) ? 0 : service.hashCode());
return result;
- }
+ }
+
+ @Override
+ public String toString() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("Sevice: ");
+ buffer.append(service);
+ buffer.append(", Port: ");
+ buffer.append(endpoint);
+
+ return buffer.toString();
+ }
}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=637972&r1=637971&r2=637972&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java Mon Mar 17 10:08:11 2008
@@ -337,7 +337,7 @@
}
//Store the address URIs that we will need to create endpoint references at runtime.
- private void configureAddressing(AxisServiceGroup serviceGroup) throws AxisFault {
+ private void configureAddressing(AxisServiceGroup serviceGroup) {
EndpointContextMap map =
(EndpointContextMap) configCtx.getProperty(org.apache.axis2.jaxws.Constants.ENDPOINT_CONTEXT_MAP);
@@ -357,8 +357,7 @@
QName portName = ed.getPortQName();
EndpointKey key = new EndpointKey(serviceName, portName);
- String[] eprs = axisService.getEPRs();
- map.put(key, (eprs == null || eprs.length == 0) ? axisService.getName() : eprs[0]);
+ map.put(key, axisService);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org