You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/06/14 11:23:55 UTC
svn commit: r784531 - in
/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms:
JMSEndpoint.java JMSListener.java
Author: veithen
Date: Sun Jun 14 09:23:53 2009
New Revision: 784531
URL: http://svn.apache.org/viewvc?rev=784531&view=rev
Log:
Removed redundant hash map.
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java
webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
Modified: webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java?rev=784531&r1=784530&r2=784531&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java (original)
+++ webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java Sun Jun 14 09:23:53 2009
@@ -40,6 +40,7 @@
private int destinationType = JMSConstants.GENERIC;
private Set<EndpointReference> endpointReferences = new HashSet<EndpointReference>();
private ContentTypeRuleSet contentTypeRuleSet;
+ private ServiceTaskManager serviceTaskManager;
public AxisService getService() {
return service;
@@ -152,4 +153,12 @@
public void setCf(JMSConnectionFactory cf) {
this.cf = cf;
}
+
+ public ServiceTaskManager getServiceTaskManager() {
+ return serviceTaskManager;
+ }
+
+ public void setServiceTaskManager(ServiceTaskManager serviceTaskManager) {
+ this.serviceTaskManager = serviceTaskManager;
+ }
}
Modified: webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java?rev=784531&r1=784530&r2=784531&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java (original)
+++ webservices/commons/trunk/modules/transport/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java Sun Jun 14 09:23:53 2009
@@ -65,9 +65,7 @@
private JMSConnectionFactoryManager connFacManager;
/** A Map of service name to the JMS endpoints */
private Map<String,JMSEndpoint> serviceNameToEndpointMap = new HashMap<String,JMSEndpoint>();
- /** A Map of service name to its ServiceTaskManager instances */
- private Map<String, ServiceTaskManager> serviceNameToSTMMap =
- new HashMap<String, ServiceTaskManager>();
+
private final TransportErrorSourceSupport tess = new TransportErrorSourceSupport(this);
/**
@@ -157,13 +155,14 @@
}
endpoint.computeEPRs(); // compute service EPR and keep for later use
- serviceNameToEndpointMap.put(service.getName(), endpoint);
ServiceTaskManager stm = ServiceTaskManagerFactory.createTaskManagerForService(cf, service, workerPool);
stm.setJmsMessageReceiver(new JMSMessageReceiver(this, cf, endpoint));
stm.start();
- serviceNameToSTMMap.put(service.getName(), stm);
+ endpoint.setServiceTaskManager(stm);
+ serviceNameToEndpointMap.put(service.getName(), endpoint);
+
for (int i=0; i<3; i++) {
if (stm.getActiveTaskCount() > 0) {
log.info("Started to listen on destination : " + stm.getDestinationJNDIName() +
@@ -188,8 +187,9 @@
*/
protected void stopListeningForService(AxisService service) {
- ServiceTaskManager stm = serviceNameToSTMMap.get(service.getName());
- if (stm != null) {
+ JMSEndpoint endpoint = serviceNameToEndpointMap.get(service.getName());
+ if (endpoint != null) {
+ ServiceTaskManager stm = endpoint.getServiceTaskManager();
if (log.isDebugEnabled()) {
log.debug("Stopping listening on destination : " + stm.getDestinationJNDIName() +
" for service : " + stm.getServiceName());
@@ -197,7 +197,6 @@
stm.stop();
- serviceNameToSTMMap.remove(service.getName());
serviceNameToEndpointMap.remove(service.getName());
log.info("Stopped listening for JMS messages to service : " + service.getName());
@@ -234,8 +233,8 @@
public void pause() throws AxisFault {
if (state != BaseConstants.STARTED) return;
try {
- for (ServiceTaskManager stm : serviceNameToSTMMap.values()) {
- stm.pause();
+ for (JMSEndpoint endpoint : serviceNameToEndpointMap.values()) {
+ endpoint.getServiceTaskManager().pause();
}
state = BaseConstants.PAUSED;
log.info("Listener paused");
@@ -251,8 +250,8 @@
public void resume() throws AxisFault {
if (state != BaseConstants.PAUSED) return;
try {
- for (ServiceTaskManager stm : serviceNameToSTMMap.values()) {
- stm.resume();
+ for (JMSEndpoint endpoint : serviceNameToEndpointMap.values()) {
+ endpoint.getServiceTaskManager().resume();
}
state = BaseConstants.STARTED;
log.info("Listener resumed");