WFLY-19613 Bypass immutability check when redundant.

ropalka · Aug 7, 2024 · fc8a193 · fc8a193
1 parent 64c7525
commit fc8a193
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...a/org/wildfly/clustering/web/cache/session/attributes/coarse/CoarseSessionAttributes.java b/...a/org/wildfly/clustering/web/cache/session/attributes/coarse/CoarseSessionAttributes.java
@@ -67,7 +67,8 @@ public Object setAttribute(String name, Object value) {
     @Override
     public Object getAttribute(String name) {
         Object value = this.attributes.get(name);
-        if (!this.immutability.test(value)) {
+        // Bypass immutability check if session is already dirty
+        if (!this.dirty.get() && !this.immutability.test(value)) {
             this.dirty.set(true);
         }
         return value;

diff --git a/.../java/org/wildfly/clustering/web/cache/session/attributes/fine/FineSessionAttributes.java b/.../java/org/wildfly/clustering/web/cache/session/attributes/fine/FineSessionAttributes.java
@@ -55,8 +55,9 @@ public Object getAttribute(String name) {
 
         if (value != null) {
             // If the object is mutable, we need to mutate this value on close
-            if (!this.immutability.test(value)) {
-                synchronized (this.updates) {
+            synchronized (this.updates) {
+                // Bypass immutability check if we are already updating this attribute
+                if (!this.updates.containsKey(name) && !this.immutability.test(value)) {
                     this.updates.put(name, value);
                 }
             }