Fix "Restricted listeners property file not found" message fix

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@612991 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java
index d019c38..0d3e265 100644 (file)
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -88,7 +88,7 @@ public class DefaultInstanceManager implements InstanceManager {
                     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"));
             }

diff --git a/java/org/apache/catalina/core/RestrictedListeners.properties b/java/org/apache/catalina/core/RestrictedListeners.properties
new file mode 100644 (file)
index 0000000..ae1e83e
--- /dev/null
+++ b/java/org/apache/catalina/core/RestrictedListeners.properties
@@ -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.

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 05833fb..80b1245 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>