From b8ebd37633abb1d499fd9c2cf64c0691608f03ac Mon Sep 17 00:00:00 2001
From: Markus Jung <jungm@apache.org>
Date: Mon, 12 Oct 2026 13:02:11 +0200
Subject: [PATCH] MYFACES-4770 viewscopecdimap.put() returns the previous value

---
 .../myfaces/cdi/view/ViewScopeCDIMap.java     |  3 +-
 .../myfaces/cdi/view/ViewScopeCDIMapTest.java | 43 +++++++++++++++++++
 .../myfaces/cdi/view/viewScopeCDIMap.xhtml    | 29 +++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 impl/src/test/java/org/apache/myfaces/cdi/view/ViewScopeCDIMapTest.java
 create mode 100644 impl/src/test/resources/org/apache/myfaces/cdi/view/viewScopeCDIMap.xhtml

diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java
index aa1b077d86..c6048efcc4 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeCDIMap.java
@@ -133,7 +133,8 @@ public Object put(String key, Object value)
 
         ContextualInstanceInfo info = new ContextualInstanceInfo();
         info.setContextualInstance(value);
-        return getCreationalContextInstances().put(beanKey, info);
+        ContextualInstanceInfo previous = getCreationalContextInstances().put(beanKey, info);
+        return previous == null ? null : previous.getContextualInstance();
     }
 
     @Override
diff --git a/impl/src/test/java/org/apache/myfaces/cdi/view/ViewScopeCDIMapTest.java b/impl/src/test/java/org/apache/myfaces/cdi/view/ViewScopeCDIMapTest.java
new file mode 100644
index 0000000000..7fc2487c7b
--- /dev/null
+++ b/impl/src/test/java/org/apache/myfaces/cdi/view/ViewScopeCDIMapTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.cdi.view;
+
+import java.util.Map;
+
+import org.apache.myfaces.test.core.AbstractMyFacesCDIRequestTestCase;
+import org.apache.myfaces.view.ViewScopeProxyMap;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ViewScopeCDIMapTest extends AbstractMyFacesCDIRequestTestCase
+{
+    @Test
+    public void testPutReturnsPreviousValue() throws Exception
+    {
+        startViewRequest("/viewScopeCDIMap.xhtml");
+        processLifecycleExecuteAndRender();
+
+        Map<String, Object> viewMap = facesContext.getViewRoot().getViewMap();
+        Assertions.assertInstanceOf(ViewScopeCDIMap.class, ((ViewScopeProxyMap) viewMap).getDelegate());
+
+        Assertions.assertNull(viewMap.put("key", "first"));
+        Assertions.assertEquals("first", viewMap.put("key", "second"));
+        Assertions.assertEquals("second", viewMap.get("key"));
+    }
+}
diff --git a/impl/src/test/resources/org/apache/myfaces/cdi/view/viewScopeCDIMap.xhtml b/impl/src/test/resources/org/apache/myfaces/cdi/view/viewScopeCDIMap.xhtml
new file mode 100644
index 0000000000..53a6394b63
--- /dev/null
+++ b/impl/src/test/resources/org/apache/myfaces/cdi/view/viewScopeCDIMap.xhtml
@@ -0,0 +1,29 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:h="jakarta.faces.html">
+
+<h:head>
+    <title>ViewScopeCDIMap Test</title>
+</h:head>
+
+<h:body>
+</h:body>
+</html>