Author: fschumacher
Date: Sat Sep 12 19:18:02 2015
New Revision: 1702668
URL: http://svn.apache.org/r1702668
Log:
Add LocalStrings entry standardContext.resourcesStop and change usage of key
standardContext.resources.started (which is missing in LocalStrings) to
standardContext.resourcesStart (which is already there)
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
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=1702668&r1=1702667&r2=1702668&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Sat Sep
12 19:18:02 2015
@@ -149,6 +149,7 @@ standardContext.reloadingCompleted=Reloa
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.resourcesInit=Error initializing static Resources
standardContext.resourcesStart=Error starting static Resources
+standardContext.resourcesStop=Error stopping static Resources
standardContext.sciFail=Error during ServletContainerInitializer processing
standardContext.securityConstraint.mixHttpMethod=It is not permitted to mix
<http-method> and <http-method-omission> in the same web resource collection
standardContext.securityConstraint.pattern=Invalid <url-pattern> {0} in
security constraint
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1702668&r1=1702667&r2=1702668&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sat Sep 12
19:18:02 2015
@@ -2342,7 +2342,7 @@ public class StandardContext extends Con
try {
if (getState().isAvailable()) {
throw new IllegalStateException
- (sm.getString("standardContext.resources.started"));
+ (sm.getString("standardContext.resourcesStart"));
}
oldResources = this.resources;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
