payara#4281 Introduced internal getter that does not cause deadlock

- isValid has side effect described in Session interface - we cannot break contract
Pandrex247 · Apr 16, 2020 · b664e51 · b664e51
1 parent 4b1b4af
commit b664e51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java
@@ -1346,13 +1346,22 @@ public Map<String, Object> getAttributes() {
     @Override
     public Enumeration<String> getAttributeNames() {
 
-        if (!getIsValid()) {
+        if (!isValid()) {
             throw new IllegalStateException
               ("getAttributeNames: " + RESOURCE_BUNDLE.getString(LogFacade.SESSION_INVALIDATED_EXCEPTION));
         }
 
-        return (new Enumerator<>(attributes.keySet(), true));
+        return getAttributeNamesInternal();
+
+    }
 
+    /**
+     * Returns names of attributes even for expired session.
+     *
+     * @return names of attributes ignoring state of session
+     */
+    protected Enumerator<String> getAttributeNamesInternal() {
+        return new Enumerator<>(attributes.keySet(), true);
     }
 
 

diff --git a/...erver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/BaseHASession.java b/...erver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/BaseHASession.java
@@ -236,7 +236,7 @@ public String superToString() {
         sb.append("isValid:" + getIsValid());
 
         if (getIsValid()) {
-            Enumeration<String> attrNamesEnum = getAttributeNames();
+            Enumeration<String> attrNamesEnum = getAttributeNamesInternal();
             while(attrNamesEnum.hasMoreElements()) {
                 String nextAttrName = attrNamesEnum.nextElement();
                 Object nextAttrValue = getAttributeInternal(nextAttrName);