Merge pull request #5234 from santoszv/viewmapbug

View maps entries are not restored in "finally" block
eclipse-ee4j · May 20, 2023 · 75ab32d · 75ab32d
2 parents 4b48788 + 23a5d02
commit 75ab32d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/impl/src/main/java/com/sun/faces/application/view/ViewMetadataImpl.java b/impl/src/main/java/com/sun/faces/application/view/ViewMetadataImpl.java
@@ -97,8 +97,9 @@ public UIViewRoot createMetadataView(FacesContext context) {
                 Map<String, Object> currentViewMap = currentViewRoot.getViewMap(false);
 
                 if (!isEmpty(currentViewMap)) {
+                    currentViewMapShallowCopy = new HashMap<>(currentViewMap);
                     metadataView.getViewMap(true)
-                                .putAll(new HashMap<>(currentViewMap));
+                                .putAll(currentViewMapShallowCopy);
                 }
             }