From dd6c3044aabdc08adc37cc9bc3e31eb8e0736b3b Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 29 Nov 2010 15:39:50 +0000 Subject: [PATCH] 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 --- java/org/apache/naming/factory/BeanFactory.java | 3 ++- webapps/docs/changelog.xml | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java/org/apache/naming/factory/BeanFactory.java b/java/org/apache/naming/factory/BeanFactory.java index 8df8bb5f2..e65da1af2 100644 --- 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 8cd6c5999..a68adf441 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -56,9 +56,13 @@ Further performance improvements to session ID generation. Remove legacy - configuration options that are no longer required. + configuration options that are no longer required. (markt) + 50351: Fix the regression that broke BeanFactory resources + caused by the previous fix for 50159. (markt) + + 50358: Set the correct LifecycleState when stopping instances of the deprecated Embedded class. (markt) -- 2.11.0