Author: pero
Date: Thu Jan 17 13:45:45 2008
New Revision: 612991
URL: http://svn.apache.org/viewvc?rev=612991&view=rev
Log:
Fix "Restricted listeners property file not found" message fix
Added:
tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/webapps/docs/changelog.xml
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=612991&r1=612990&r2=612991&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu
Jan 17 13:45:45 2008
@@ -88,7 +88,7 @@
this.getClass().getClassLoader().getResourceAsStream
("org/apache/catalina/core/RestrictedListeners.properties");
if (is != null) {
- restrictedFilters.load(is);
+ restrictedListeners.load(is);
} else {
catalinaContext.getLogger().error(sm.getString("defaultInstanceManager.restrictedListenersResources"));
}
Added: tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties?rev=612991&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties
(added)
+++ tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties
Thu Jan 17 13:45:45 2008
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
Propchange:
tomcat/trunk/java/org/apache/catalina/core/RestrictedListeners.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=612991&r1=612990&r2=612991&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan 17 13:45:45 2008
@@ -46,6 +46,9 @@
</subsection>
<subsection name="Catalina">
<changelog>
+ <fix><bug>44261</bug>: Fix "Restricted listeners property file not
found" message fix. Patch provided by
+ David Jencks. (pero)
+ </fix>
<fix>
Fix ManagerServlet.exipreSession throws Exceptions as iterate longer
session lists at production servers (pero)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
