Author: markt
Date: Mon Nov 29 15:39:50 2010
New Revision: 1040157
URL: http://svn.apache.org/viewvc?rev=1040157&view=rev
Log:
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
Modified:
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1040157&r1=1040156&r2=1040157&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Mon Nov 29
15:39:50 2010
@@ -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;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1040157&r1=1040156&r2=1040157&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 29 15:39:50 2010
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
