MYFACES-4624

apache · Aug 22, 2023 · 304099d · 304099d
1 parent e71fe55
commit 304099d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java
@@ -561,7 +561,12 @@ public void invokeContextCallback(FacesContext context, UIComponent target)
                     }
                 }
             }
-
+
+            if (target == null && nextExpression == null)
+            {
+                return;
+            }
+
             topCallback.invokeContextCallback(facesContext, previous);
         }
 

diff --git a/impl/src/test/java/org/apache/myfaces/component/search/SearchExpressionImplTest.java b/impl/src/test/java/org/apache/myfaces/component/search/SearchExpressionImplTest.java
@@ -87,6 +87,16 @@ public void testSearchExpression1() throws Exception
                 searchContext, "@this:@parent:showName").get(0);
         Assertions.assertEquals("mainForm:showName", componentId);
 
+        componentId = facesContext.getApplication().getSearchExpressionHandler().resolveClientIds(
+                searchContext, "@form:inputOutsideForm").get(0);
+        Assertions.assertEquals("mainForm:inputOutsideForm", componentId);
+
+        final SearchExpressionContext currentSearchContext = searchContext;
+        Assertions.assertThrows(ComponentNotFoundException.class, () ->
+        {
+            facesContext.getApplication().getSearchExpressionHandler().resolveClientIds(currentSearchContext, ":inputOutsideForm");
+        });
+
         componentId = facesContext.getApplication().getSearchExpressionHandler().resolveClientIds(
                 searchContext, "mainForm:table:0:baseText").get(0);
         Assertions.assertEquals("mainForm:table:0:baseText", componentId);

diff --git a/impl/src/test/resources/org/apache/myfaces/component/search/search1.xhtml b/impl/src/test/resources/org/apache/myfaces/component/search/search1.xhtml
@@ -29,8 +29,11 @@
     <h:outputText id="topLevelOutputText" value="test" />
 
     <h:panelGrid id="panelGridId" columns="1">
+
         <h:form id="mainForm">
 
+            <h:inputText id="inputOutsideForm"></h:inputText>
+
             <h:outputLabel id="labelName" for="name" value="Name: "/>
             <div>
             <h:inputText id="name" value="NAME"/>