One more Final fixes for #950

Atmosphere · May 6, 2013 · f0f0769 · f0f0769
1 parent eaf0fec
commit f0f0769
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java
@@ -446,8 +446,6 @@ public Action timedout(AtmosphereRequest req, AtmosphereResponse res)
     }
 
     protected boolean trackActiveRequest(AtmosphereRequest req) {
-        SessionTimeoutSupport.restoreTimeout(req);
-
         if (trackActiveRequest) {
             try {
                 long l = (Long) req.getAttribute(MAX_INACTIVE);

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java
@@ -330,7 +330,7 @@ public AtmosphereResource resume() {
                     asyncSupport.action(this);
                 }
             } else {
-                logger.debug("Cannot resume an already resumed/cancelled request {}", this);
+                logger.trace("Cannot resume an already resumed/cancelled request {}", this);
                 return this;
             }
         } catch (Throwable t) {
@@ -842,7 +842,7 @@ public AtmosphereResourceImpl atmosphereHandler(AtmosphereHandler atmosphereHand
     public void cancel() throws IOException {
         if (!isCancelled.getAndSet(true)) {
             logger.trace("Cancelling {}", uuid);
-            if (action.type() == Action.TYPE.SUSPEND) {
+            if (action.type() == Action.TYPE.CANCELLED) {
                 SessionTimeoutSupport.restoreTimeout(req);
             }
             action.type(Action.TYPE.RESUME);