From b66ec3d57e2d4f526b87d36254600b244fc2eb4d Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Fri, 15 Mar 2013 15:53:35 +0100 Subject: [PATCH] Made isOpen() public to avoid clashes with AbstractEndPoint. --- .../org/eclipse/jetty/io/IdleTimeout.java | 54 +++++++++---------- .../org/eclipse/jetty/io/IdleTimeoutTest.java | 25 +++++---- 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java b/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java index bb2870f63c4..dd81b4656a7 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java @@ -26,16 +26,13 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.thread.Scheduler; - - -/* ------------------------------------------------------------ */ -/** An Abstract implementation of an Idle Timeout. - * +/** + * An Abstract implementation of an Idle Timeout. + *

* This implementation is optimised that timeout operations are not cancelled on * every operation. Rather timeout are allowed to expire and a check is then made * to see when the last operation took place. If the idle timeout has not expired, * the timeout is rescheduled for the earliest possible time a timeout could occur. - * */ public abstract class IdleTimeout { @@ -43,15 +40,15 @@ public abstract class IdleTimeout private final Scheduler _scheduler; private final AtomicReference _timeout = new AtomicReference<>(); private volatile long _idleTimeout; - private volatile long _idleTimestamp=System.currentTimeMillis(); + private volatile long _idleTimestamp = System.currentTimeMillis(); private final Runnable _idleTask = new Runnable() { @Override public void run() { - long idleLeft=checkIdleTimeout(); - if (idleLeft>=0) + long idleLeft = checkIdleTimeout(); + if (idleLeft >= 0) scheduleIdleTimeout(idleLeft > 0 ? idleLeft : getIdleTimeout()); } }; @@ -61,7 +58,7 @@ public abstract class IdleTimeout */ public IdleTimeout(Scheduler scheduler) { - _scheduler=scheduler; + _scheduler = scheduler; } public long getIdleTimestamp() @@ -76,14 +73,14 @@ public abstract class IdleTimeout public void setIdleTimeout(long idleTimeout) { - long old=_idleTimeout; + long old = _idleTimeout; _idleTimeout = idleTimeout; // Do we have an old timeout - if (old>0) + if (old > 0) { // if the old was less than or equal to the new timeout, then nothing more to do - if (old<=idleTimeout) + if (old <= idleTimeout) return; // old timeout is too long, so cancel it. @@ -93,22 +90,22 @@ public abstract class IdleTimeout } // If we have a new timeout, then check and reschedule - if (idleTimeout>0 && isOpen()) + if (idleTimeout > 0 && isOpen()) _idleTask.run(); - } - /** This method should be called when non-idle activity has taken place. + /** + * This method should be called when non-idle activity has taken place. */ public void notIdle() { - _idleTimestamp=System.currentTimeMillis(); + _idleTimestamp = System.currentTimeMillis(); } private void scheduleIdleTimeout(long delay) { Scheduler.Task newTimeout = null; - if (isOpen() && delay > 0 && _scheduler!=null) + if (isOpen() && delay > 0 && _scheduler != null) newTimeout = _scheduler.schedule(_idleTask, delay, TimeUnit.MILLISECONDS); Scheduler.Task oldTimeout = _timeout.getAndSet(newTimeout); if (oldTimeout != null) @@ -117,10 +114,10 @@ public abstract class IdleTimeout public void onOpen() { - if (_idleTimeout>0) + if (_idleTimeout > 0) _idleTask.run(); } - + public void onClose() { Scheduler.Task oldTimeout = _timeout.getAndSet(null); @@ -162,22 +159,23 @@ public abstract class IdleTimeout } } - return idleLeft>=0?idleLeft:0; + return idleLeft >= 0 ? idleLeft : 0; } return -1; } - /* ------------------------------------------------------------ */ - /** This abstract method is called when the idle timeout has expired. + /** + * This abstract method is called when the idle timeout has expired. + * * @param timeout a TimeoutException */ - abstract protected void onIdleExpired(TimeoutException timeout); + protected abstract void onIdleExpired(TimeoutException timeout); - - /* ------------------------------------------------------------ */ - /** This abstract method should be called to check if idle timeouts + /** + * This abstract method should be called to check if idle timeouts * should still be checked. + * * @return True if the entity monitored should still be checked for idle timeouts */ - abstract protected boolean isOpen(); + public abstract boolean isOpen(); } diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/IdleTimeoutTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/IdleTimeoutTest.java index 9bb8729427d..5c4bb4e8aa4 100644 --- a/jetty-io/src/test/java/org/eclipse/jetty/io/IdleTimeoutTest.java +++ b/jetty-io/src/test/java/org/eclipse/jetty/io/IdleTimeoutTest.java @@ -22,7 +22,6 @@ package org.eclipse.jetty.io; import java.util.concurrent.TimeoutException; import junit.framework.Assert; - import org.eclipse.jetty.util.thread.TimerScheduler; import org.junit.After; import org.junit.Before; @@ -32,10 +31,10 @@ public class IdleTimeoutTest { volatile boolean _open; volatile TimeoutException _expired; - + TimerScheduler _timer; IdleTimeout _timeout; - + @Before public void setUp() throws Exception { @@ -50,9 +49,9 @@ public class IdleTimeoutTest { _expired=timeout; } - + @Override - protected boolean isOpen() + public boolean isOpen() { return _open; } @@ -65,7 +64,7 @@ public class IdleTimeoutTest { _open=false; _timer.stop(); - + } @Test @@ -76,10 +75,10 @@ public class IdleTimeoutTest Thread.sleep(100); _timeout.notIdle(); } - + Assert.assertNull(_expired); } - + @Test public void testIdle() throws Exception { @@ -91,7 +90,7 @@ public class IdleTimeoutTest Thread.sleep(1500); Assert.assertNotNull(_expired); } - + @Test public void testClose() throws Exception { @@ -104,7 +103,7 @@ public class IdleTimeoutTest Thread.sleep(1500); Assert.assertNull(_expired); } - + @Test public void testClosed() throws Exception { @@ -153,7 +152,7 @@ public class IdleTimeoutTest Thread.sleep(1000); Assert.assertNotNull(_expired); } - - - + + + }