remm 2002/10/14 07:31:23
Modified: catalina/src/share/org/apache/naming/resources
ProxyDirContext.java
Added: catalina/src/share/org/apache/naming/resources
ImmutableNameNotFoundException.java
Log:
- Port patch.
- Save on NamingException object creation.
Revision Changes Path
1.14 +13 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java
Index: ProxyDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ProxyDirContext.java 4 Oct 2002 12:26:10 -0000 1.13
+++ ProxyDirContext.java 14 Oct 2002 14:31:23 -0000 1.14
@@ -76,6 +76,7 @@
import javax.naming.Name;
import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
+import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import javax.naming.directory.Attributes;
@@ -210,6 +211,13 @@
protected int cacheObjectMaxSize = 32768; // 32 KB
+ /**
+ * Immutable name not found exception.
+ */
+ protected NameNotFoundException notFoundException =
+ new ImmutableNameNotFoundException();
+
+
// --------------------------------------------------------- Public Methods
@@ -1396,7 +1404,7 @@
}
}
if (!cacheEntry.exists) {
- throw new NamingException("Resource not found");
+ throw notFoundException;
}
return (cacheEntry);
}
1.1
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java
Index: ImmutableNameNotFoundException.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/ImmutableNameNotFoundException.java,v
1.1 2002/10/14 14:31:23 remm Exp $
* $Revision: 1.1 $
* $Date: 2002/10/14 14:31:23 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.naming.resources;
import javax.naming.Name;
import javax.naming.NameNotFoundException;
/**
* Immutable exception to avoid useless object creation by the proxy context.
* This should be used only by the proxy context. Actual contexts should return
* properly populated exceptions.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @version $Revision: 1.1 $
*/
public class ImmutableNameNotFoundException
extends NameNotFoundException {
public void appendRemainingComponent(String name) {}
public void appendRemainingName(Name name) {}
public void setRemainingName(Name name) {}
public void setResolverName(Name name) {}
public void setRootCause(Throwable e) {}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
