Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50351

Fix the regression that broke BeanFactory resources caused by the previous fix for 50159

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1040157 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/naming/factory/BeanFactory.java b/java/org/apache/naming/factory/BeanFactory.java
index 8df8bb5..e65da1a 100644 (file)
--- a/java/org/apache/naming/factory/BeanFactory.java
+++ b/java/org/apache/naming/factory/BeanFactory.java
@@ -149,7 +149,8 @@ public class BeanFactory
                     String propName = ra.getType();
                     
                     if (propName.equals(Constants.FACTORY) ||
-                        propName.equals("scope") || propName.equals("auth")) {
+                        propName.equals("scope") || propName.equals("auth") ||
+                        propName.equals("singleton")) {
                         continue;
                     }
                     

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8cd6c59..a68adf4 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -56,9 +56,13 @@
       </fix>
       <update>
         Further performance improvements to session ID generation. Remove legacy
-        configuration options that are no longer required.
+        configuration options that are no longer required. (markt)
       </update>
       <fix>
+        <bug>50351</bug>: Fix the regression that broke BeanFactory resources
+        caused by the previous fix for <bug>50159</bug>. (markt) 
+      </fix>
+      <fix>
         <bug>50358</bug>: Set the correct LifecycleState when stopping instances
         of the deprecated Embedded class. (markt) 
       </fix>