MODCLUSTER-581 Session draining with negative timeout may wait indefi…

…nitely

core/src/main/java/org/jboss/modcluster/ModClusterService.java

@@ -695,6 +695,7 @@ private boolean drainSessions(Context context, long start, long end) {
 
                 long current = System.currentTimeMillis();
                 long timeout = end - current;
+                long pollInterval = TimeUnit.SECONDS.toMillis(1);
 
                 remainingSessions = context.getActiveSessionCount();
 
@@ -703,7 +704,7 @@ private boolean drainSessions(Context context, long start, long end) {
 
                     // Poll active sessions every second since since right after the notify, the session manager implementation
                     // will still account for that last session.
-                    listener.wait(noTimeout ? 0 : Math.min(timeout, 1000));
+                    listener.wait(noTimeout ? pollInterval : Math.min(timeout, pollInterval));
 
                     current = System.currentTimeMillis();
                     timeout = end - current;