Author: veithen
Date: Sat Oct 11 10:31:36 2008
New Revision: 703695
URL: http://svn.apache.org/viewvc?rev=703695&view=rev
Log:
AbstractPollingTransportListener: Instead of just the service name, store the
reference to the AxisService object in AbstractPollTableEntry.
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollTableEntry.java
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollTableEntry.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollTableEntry.java?rev=703695&r1=703694&r2=703695&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollTableEntry.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollTableEntry.java
Sat Oct 11 10:31:36 2008
@@ -22,6 +22,7 @@
import java.util.TimerTask;
import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.description.AxisService;
public abstract class AbstractPollTableEntry {
// status of last scan
@@ -30,8 +31,8 @@
public static final int FAILED = 2;
public static final int NONE = 3;
- /** Axis2 service name */
- private String serviceName;
+ /** Axis2 service */
+ private AxisService service;
/** next poll time */
private long nextPollTime;
/** last poll performed at */
@@ -45,12 +46,12 @@
/** Flag indicating whether polling has been canceled. */
boolean canceled;
- public String getServiceName() {
- return serviceName;
+ public AxisService getService() {
+ return service;
}
- void setServiceName(String serviceName) {
- this.serviceName = serviceName;
+ void setService(AxisService service) {
+ this.service = service;
}
public abstract EndpointReference getEndpointReference();
Modified:
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java?rev=703695&r1=703694&r2=703695&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
Sat Oct 11 10:31:36 2008
@@ -59,7 +59,7 @@
// modifies pollTable.
List<T> entriesToCancel = new ArrayList<T>();
for (T entry : pollTable) {
- if (entry.getServiceName() == null) {
+ if (entry.getService() == null) {
entriesToCancel.add(entry);
}
}
@@ -176,7 +176,7 @@
if (entry == null) {
disableTransportForService(service);
} else {
- entry.setServiceName(service.getName());
+ entry.setService(service);
schedulePoll(entry, getPollInterval(service));
pollTable.add(entry);
}
@@ -206,9 +206,13 @@
*/
public EndpointReference[] getEPRsForService(String serviceName, String
ip) throws AxisFault {
for (T entry : pollTable) {
- if (entry.getServiceName().equals(serviceName) ||
- serviceName.startsWith(entry.getServiceName() + ".")) {
- return new EndpointReference[]{ entry.getEndpointReference() };
+ AxisService service = entry.getService();
+ if (service != null) {
+ String candidateName = service.getName();
+ if (candidateName.equals(serviceName) ||
+ serviceName.startsWith(candidateName + ".")) {
+ return new EndpointReference[]{
entry.getEndpointReference() };
+ }
}
}
return null;
@@ -217,7 +221,7 @@
@Override
protected void stopListeningForService(AxisService service) {
for (T entry : pollTable) {
- if (service.getName().equals(entry.getServiceName())) {
+ if (service == entry.getService()) {
cancelPoll(entry);
break;
}
Modified:
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java?rev=703695&r1=703694&r2=703695&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java
Sat Oct 11 10:31:36 2008
@@ -433,8 +433,8 @@
private MessageContext createMessageContext(PollTableEntry entry) throws
AxisFault {
MessageContext msgContext = createMessageContext();
- if (entry.getServiceName() != null) {
- AxisService service =
cfgCtx.getAxisConfiguration().getService(entry.getServiceName());
+ AxisService service = entry.getService();
+ if (service != null) {
msgContext.setAxisService(service);
// find the operation for the message, or default to one
