Author: kkolinko
Date: Mon Jan 4 15:49:58 2016
New Revision: 1722902
URL: http://svn.apache.org/viewvc?rev=1722902&view=rev
Log:
Fix messed-up message resources in DefaultInstanceManager.
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1722902&r1=1722901&r2=1722902&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Mon
Jan 4 15:49:58 2016
@@ -95,11 +95,11 @@ public class DefaultInstanceManager impl
catalinaContext.getLogger());
restrictedListeners = loadProperties(
"org/apache/catalina/core/RestrictedListeners.properties",
- "defaultInstanceManager.restrictedListenersResources",
+
sm.getString("defaultInstanceManager.restrictedListenersResources"),
catalinaContext.getLogger());
restrictedFilters = loadProperties(
"org/apache/catalina/core/RestrictedFilters.properties",
- "defaultInstanceManager.restrictedFiltersResource",
+
sm.getString("defaultInstanceManager.restrictedFiltersResource"),
catalinaContext.getLogger());
this.context = context;
this.injectionMap = injectionMap;
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1722902&r1=1722901&r2=1722902&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Jan
4 15:49:58 2016
@@ -88,7 +88,6 @@ containerBase.backgroundProcess.cluster=
containerBase.backgroundProcess.realm=Exception processing realm {0}
background process
containerBase.backgroundProcess.valve=Exception processing valve {0}
background process
containerBase.backgroundProcess.unexpectedThreadDeath=Unexpected death of
background thread {0}
-defaultInstanceManager.invalidInjection=Invalid method resource injection
annotation
filterChain.filter=Filter execution threw an exception
filterChain.servlet=Servlet execution threw an exception
jreLeakListener.gcDaemonFail=Failed to trigger creation of the GC Daemon
thread during Tomcat start to prevent possible memory leaks. This is expected
on non-Sun JVMs.
@@ -222,6 +221,7 @@ standardWrapper.waiting=Waiting for {0}
threadLocalLeakPreventionListener.lifecycleEvent.error=Exception processing
lifecycle event {0}
threadLocalLeakPreventionListener.containerEvent.error=Exception processing
container event {0}
+defaultInstanceManager.invalidInjection=Invalid method resource injection
annotation
defaultInstanceManager.restrictedServletsResource=Restricted servlets property
file not found
-defaultInstanceManager.restrictedFiltersResource=Restricted filters property
file not founddefaultInstanceManager.privilegedFilter=Filter of class {0} is
privileged and cannot be loaded by this web application
-defaultInstanceManager.restrictedListenersResources="Restricted listeners
property file not found
+defaultInstanceManager.restrictedFiltersResource=Restricted filters property
file not found
+defaultInstanceManager.restrictedListenersResources=Restricted listeners
property file not found
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
