Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 83897 invoked from network); 17 Jan 2008 21:46:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jan 2008 21:46:13 -0000 Received: (qmail 86293 invoked by uid 500); 17 Jan 2008 21:45:59 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 86247 invoked by uid 500); 17 Jan 2008 21:45:59 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 86236 invoked by uid 500); 17 Jan 2008 21:45:59 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 86233 invoked by uid 99); 17 Jan 2008 21:45:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2008 13:45:59 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2008 21:45:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4A51A1A9832; Thu, 17 Jan 2008 13:45:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r612991 - in /tomcat/trunk: java/org/apache/catalina/core/DefaultInstanceManager.java java/org/apache/catalina/core/RestrictedListeners.properties webapps/docs/changelog.xml Date: Thu, 17 Jan 2008 21:45:47 -0000 To: tomcat-dev@jakarta.apache.org From: pero@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080117214548.4A51A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ + 44261: Fix "Restricted listeners property file not found" message fix. Patch provided by + David Jencks. (pero) + Fix ManagerServlet.exipreSession throws Exceptions as iterate longer session lists at production servers (pero) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org