remm 01/10/23 21:35:29
Modified: catalina/src/share/org/apache/naming Tag: tomcat_40_branch
NamingContext.java
Log:
- Specify the name in the exception message for the alreadyBound error.
Patch submitted by Mike McCallister <r2126c at email.sps.mot.com>
Revision Changes Path
No revision
No revision
1.3.2.2 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java
Index: NamingContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- NamingContext.java 2001/09/18 22:28:57 1.3.2.1
+++ NamingContext.java 2001/10/24 04:35:29 1.3.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
1.3.2.1 2001/09/18 22:28:57 remm Exp $
- * $Revision: 1.3.2.1 $
- * $Date: 2001/09/18 22:28:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
1.3.2.2 2001/10/24 04:35:29 remm Exp $
+ * $Revision: 1.3.2.2 $
+ * $Date: 2001/10/24 04:35:29 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
- * @version $Revision: 1.3.2.1 $ $Date: 2001/09/18 22:28:57 $
+ * @version $Revision: 1.3.2.2 $ $Date: 2001/10/24 04:35:29 $
*/
public class NamingContext implements Context {
@@ -888,7 +888,7 @@
} else {
if ((!rebind) && (entry != null)) {
throw new NamingException
- (sm.getString("namingContext.alreadyBound"));
+ (sm.getString("namingContext.alreadyBound", name.get(0)));
} else {
// Getting the type of the object and wrapping it within a new
// NamingEntry