Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 94101 invoked from network); 24 Apr 2003 06:58:30 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 24 Apr 2003 06:58:30 -0000 Received: (qmail 3161 invoked by uid 97); 24 Apr 2003 07:00:38 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 3154 invoked from network); 24 Apr 2003 07:00:37 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 24 Apr 2003 07:00:37 -0000 Received: (qmail 93299 invoked by uid 500); 24 Apr 2003 06:58:21 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 93287 invoked by uid 500); 24 Apr 2003 06:58:21 -0000 Received: (qmail 93282 invoked from network); 24 Apr 2003 06:58:20 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 24 Apr 2003 06:58:20 -0000 Received: (qmail 36475 invoked by uid 1290); 24 Apr 2003 06:58:19 -0000 Date: 24 Apr 2003 06:58:19 -0000 Message-ID: <20030424065819.36473.qmail@icarus.apache.org> From: amyroh@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources ProxyDirContext.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N amyroh 2003/04/23 23:58:18 Modified: catalina/src/share/org/apache/naming/resources ProxyDirContext.java Log: Minor fix to avoid NegativeArraySizeException when cache.length is 0. Revision Changes Path 1.8 +7 -7 jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java Index: ProxyDirContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ProxyDirContext.java 23 Apr 2003 17:37:18 -0000 1.7 +++ ProxyDirContext.java 24 Apr 2003 06:58:18 -0000 1.8 @@ -783,7 +783,7 @@ public Name composeName(Name name, Name prefix) throws NamingException { prefix = (Name) name.clone(); - return prefix.addAll(name); + return prefix.addAll(name); } @@ -1684,8 +1684,9 @@ * Remove entry from cache. */ protected boolean cacheUnload(String name) { - if (cache == null) + if ((cache == null) || (cache.length==0)) { return false; + } synchronized (this) { CacheEntry[] newCache = new CacheEntry[cache.length - 1]; CacheEntry removedEntry = removeMap(cache, newCache, name); @@ -1904,4 +1905,3 @@ } - --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org