FELIX-5819 : Container session should not be invalidated

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1827956 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 29, 2018 · f86428f · f86428f
1 parent 49fb461
commit f86428f
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpSessionWrapper.java
@@ -148,31 +148,33 @@ public HttpSessionWrapper(final HttpSession session,
         this.delegate = session;
         this.context = context;
         this.sessionId = context.getServletContextName();
-        this.keyPrefix = ATTR_PREFIX + this.sessionId + ".";
+        this.keyPrefix = ATTR_PREFIX.concat(this.sessionId).concat(".");
+
+        final String createdAttrName = ATTR_CREATED.concat(this.sessionId);
 
         final long now = System.currentTimeMillis();
-        if ( session.getAttribute(ATTR_CREATED + this.sessionId) == null )
+        if ( session.getAttribute(createdAttrName) == null )
         {
             this.created = now;
             this.maxTimeout = session.getMaxInactiveInterval();
             this.isNew = true;
 
-            session.setAttribute(ATTR_CREATED + this.sessionId, this.created);
-            session.setAttribute(ATTR_MAX_INACTIVE + this.sessionId, this.maxTimeout);
+            session.setAttribute(createdAttrName, this.created);
+            session.setAttribute(ATTR_MAX_INACTIVE.concat(this.sessionId), this.maxTimeout);
 
             context.getHttpSessionListener().sessionCreated(new HttpSessionEvent(this));
         }
         else
         {
-            this.created = (Long)session.getAttribute(ATTR_CREATED + this.sessionId);
-            this.maxTimeout = (Integer)session.getAttribute(ATTR_MAX_INACTIVE + this.sessionId);
+            this.created = (Long)session.getAttribute(createdAttrName);
+            this.maxTimeout = (Integer)session.getAttribute(ATTR_MAX_INACTIVE.concat(this.sessionId));
             this.isNew = false;
         }
 
         this.lastAccessed = now;
         if ( !terminate )
         {
-            session.setAttribute(ATTR_LAST_ACCESSED + this.sessionId, this.lastAccessed);
+            session.setAttribute(ATTR_LAST_ACCESSED.concat(this.sessionId), this.lastAccessed);
         }
     }
 
@@ -314,6 +316,7 @@ public void invalidate()
         this.delegate.removeAttribute(ATTR_LAST_ACCESSED + this.sessionId);
         this.delegate.removeAttribute(ATTR_MAX_INACTIVE + this.sessionId);
 
+        // remove all attributes belonging to this session
         final Enumeration<String> names = this.delegate.getAttributeNames();
         while ( names.hasMoreElements() )
         {
@@ -324,12 +327,6 @@ public void invalidate()
             }
         }
 
-        // if the session is empty we can invalidate
-        if ( !this.delegate.getAttributeNames().hasMoreElements() )
-        {
-            this.delegate.invalidate();
-        }
-
         this.isInvalid = true;
     }