Author: veithen
Date: Sat Aug 23 11:02:55 2008
New Revision: 688386
URL: http://svn.apache.org/viewvc?rev=688386&view=rev
Log:
AbstractPollingTransportListener:
* Allow poll intervals to be specified in milliseconds (by appending "ms" to
the parameter value).
* Corrected a unit mismatch between the DEFAULT_POLL_INTERVAL constant and the
pollInterval argument of the schedulePoll method.
Mail & VFS transport tests:
* Reduced the poll interval to 50ms to reduce the execution time of the tests.
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseConstants.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java?rev=688386&r1=688385&r2=688386&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/AbstractPollingTransportListener.java
Sat Aug 23 11:02:55 2008
@@ -66,11 +66,9 @@
/**
* Schedule a repeated poll at the specified interval for the given service
* @param service the service to be polled
- * @param pollInterval the interval between successive polls in seconds
+ * @param pollInterval the interval between successive polls in
milliseconds
*/
public void schedulePoll(AxisService service, long pollInterval) {
- pollInterval *= 1000; // convert to millisecs
-
TimerTask task = (TimerTask) serviceToTimerTaskMap.get(service);
// if a timer task exists, cancel it first and create a new one
@@ -164,8 +162,16 @@
Parameter param =
service.getParameter(BaseConstants.TRANSPORT_POLL_INTERVAL);
long pollInterval = BaseConstants.DEFAULT_POLL_INTERVAL;
if (param != null && param.getValue() instanceof String) {
+ String s = (String)param.getValue();
+ int multiplier;
+ if (s.endsWith("ms")) {
+ s = s.substring(0, s.length()-2);
+ multiplier = 1;
+ } else {
+ multiplier = 1000;
+ }
try {
- pollInterval = Integer.parseInt(param.getValue().toString());
+ pollInterval = Integer.parseInt(s) * multiplier;
} catch (NumberFormatException e) {
log.error("Invalid poll interval : " + param.getValue() + "
for service : " +
service.getName() + " default to : "
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseConstants.java?rev=688386&r1=688385&r2=688386&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseConstants.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseConstants.java
Sat Aug 23 11:02:55 2008
@@ -82,7 +82,7 @@
*/
public static final String TRANSPORT_POLL_INTERVAL =
"transport.PollInterval";
/**
- * the default poll interval
+ * The default poll interval in milliseconds.
*/
public static final int DEFAULT_POLL_INTERVAL = 5 * 60 * 1000; // 5 mins
by default
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java?rev=688386&r1=688385&r2=688386&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
Sat Aug 23 11:02:55 2008
@@ -76,7 +76,7 @@
public void setupService(AxisService service) throws Exception {
service.addParameter("transport.mail.Protocol", env.getProtocol());
service.addParameter("transport.mail.Address", recipient.getAddress());
- service.addParameter("transport.PollInterval", "1");
+ service.addParameter("transport.PollInterval", "50ms");
for (Map.Entry<String,String> prop : recipientInProperties.entrySet())
{
service.addParameter(prop.getKey(), prop.getValue());
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java?rev=688386&r1=688385&r2=688386&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
Sat Aug 23 11:02:55 2008
@@ -45,7 +45,7 @@
@Override
public void setupService(AxisService service) throws Exception {
service.addParameter("transport.vfs.FileURI", "vfs:" +
requestFile.toURL());
- service.addParameter("transport.PollInterval", "1");
+ service.addParameter("transport.PollInterval", "50ms");
service.addParameter("transport.vfs.ActionAfterProcess", "DELETE");
}
