commit 9af6eb9eb5c889768162112ddae7d86fa7b51963
author Thiago H. de Paula Figueiredo <thiago@arsmachina.com.br> Mon Apr 08 23:24:13 2024 -0300
committer Thiago H. de Paula Figueiredo <thiago@arsmachina.com.br> Mon Apr 08 23:24:51 2024 -0300
tree 06da0e63f88a5596a89b2a4b893d69ec0e7eb172
parent b1afeeb9d40d4c3ec9bb69552a0123aade8c0bec

TAP5-2773: avoiding an infinite recursion loop

tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java

diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java
index 1fbf978..f2a20ea 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/pageload/PageClassLoaderContextManagerImpl.java
@@ -248,8 +248,7 @@
                     for (String dependency : dependencies)
                     {
                         // Avoid infinite recursion loops
-                        if (!alreadyProcessed.contains(dependency)/* && 
-                                !circularDependencies.contains(dependency)*/)
+                        if (!alreadyProcessed.contains(dependency))
                         {
                             processUsingDependencies(dependency, root, unknownContextProvider, 
                                     plasticProxyFactoryProvider, classesToInvalidate, alreadyProcessed, false);
@@ -261,15 +260,19 @@
                     for (String dependency : dependencies) 
                     {
                         PageClassLoaderContext dependencyContext = root.findByClassName(dependency);
-                        if (dependencyContext == null)
+                        // Avoid infinite recursion loops
+                        if (!alreadyProcessed.contains(dependency))
                         {
-                            dependencyContext = processUsingDependencies(dependency, root, unknownContextProvider,
-                                    plasticProxyFactoryProvider, classesToInvalidate, alreadyProcessed);
-
-                        }
-                        if (!dependencyContext.isRoot())
-                        {
-                            contextDependencies.add(dependencyContext);
+                            if (dependencyContext == null)
+                            {
+                                dependencyContext = processUsingDependencies(dependency, root, unknownContextProvider,
+                                        plasticProxyFactoryProvider, classesToInvalidate, alreadyProcessed);
+    
+                            }
+                            if (!dependencyContext.isRoot())
+                            {
+                                contextDependencies.add(dependencyContext);
+                            }
                         }
                     }