cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2001-11-12 Thread remm 

remm01/11/12 17:04:04

  Modified:catalina/src/share/org/apache/naming Tag: tomcat_40_branch
NamingContext.java
  Log:
  - Port the reference rebinding patch from the HEAD branch.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.3.2.3   +12 -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.2
  retrieving revision 1.3.2.3
  diff -u -r1.3.2.2 -r1.3.2.3
  --- NamingContext.java2001/10/24 04:35:29 1.3.2.2
  +++ NamingContext.java2001/11/13 01:04:04 1.3.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $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 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.3.2.3 2001/11/13 01:04:04 remm Exp $
  + * $Revision: 1.3.2.3 $
  + * $Date: 2001/11/13 01:04:04 $
*
* 
*
  @@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
  - * @version $Revision: 1.3.2.2 $ $Date: 2001/10/24 04:35:29 $
  + * @version $Revision: 1.3.2.3 $ $Date: 2001/11/13 01:04:04 $
*/
   
   public class NamingContext implements Context {
  @@ -831,8 +831,15 @@
   }
   } else if (entry.type == NamingEntry.REFERENCE) {
   try {
  -return NamingManager.getObjectInstance
  +Object obj = NamingManager.getObjectInstance
   (entry.value, name, this, env);
  +if (obj != null) {
  +entry.value = obj;
  +entry.type = NamingEntry.ENTRY;
  +}
  +return obj;
  +} catch (NamingException e) {
  +throw e;
   } catch (Exception e) {
   throw new NamingException(e.getMessage());
   }
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2001-10-24 Thread remm 

remm01/10/23 21:35:17

  Modified:catalina/src/share/org/apache/naming 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  ChangesPath
  1.6   +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NamingContext.java2001/10/02 05:55:18 1.5
  +++ NamingContext.java2001/10/24 04:35:17 1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.5 2001/10/02 05:55:18 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/10/02 05:55:18 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.6 2001/10/24 04:35:17 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/10/24 04:35:17 $
*
* 
*
  @@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
  - * @version $Revision: 1.5 $ $Date: 2001/10/02 05:55:18 $
  + * @version $Revision: 1.6 $ $Date: 2001/10/24 04:35:17 $
*/
   
   public class NamingContext implements Context {
  @@ -892,7 +892,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

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2001-10-24 Thread remm 

remm01/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  ChangesPath
  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.java2001/09/18 22:28:57 1.3.2.1
  +++ NamingContext.java2001/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

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2001-10-01 Thread remm 

remm01/10/01 22:55:18

  Modified:catalina/src/share/org/apache/naming NamingContext.java
  Log:
  - Update the entry value after resolving the reference (experimental change).
  
  Revision  ChangesPath
  1.5   +9 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NamingContext.java2001/09/18 22:30:01 1.4
  +++ NamingContext.java2001/10/02 05:55:18 1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.4 2001/09/18 22:30:01 remm Exp $
  - * $Revision: 1.4 $
  - * $Date: 2001/09/18 22:30:01 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.5 2001/10/02 05:55:18 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2001/10/02 05:55:18 $
*
* 
*
  @@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
  - * @version $Revision: 1.4 $ $Date: 2001/09/18 22:30:01 $
  + * @version $Revision: 1.5 $ $Date: 2001/10/02 05:55:18 $
*/
   
   public class NamingContext implements Context {
  @@ -831,8 +831,12 @@
   }
   } else if (entry.type == NamingEntry.REFERENCE) {
   try {
  -return NamingManager.getObjectInstance
  +Object obj = NamingManager.getObjectInstance
   (entry.value, name, this, env);
  +if (obj != null) {
  +entry.value = obj;
  +}
  +return obj;
   } catch (Exception e) {
   throw new NamingException(e.getMessage());
   }

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2001-09-18 Thread remm 

remm01/09/18 15:28:57

  Modified:catalina/src/share/org/apache/naming Tag: tomcat_40_branch
NamingContext.java
  Log:
  - Fix bug 3699 - A recursive function call in org.apache.naming.NamingContext.
Patch submitted by ygary2 at yahoo.com (sorry I couldn't find your name anywhere).
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.3.2.1   +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
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NamingContext.java2001/02/16 00:05:54 1.3
  +++ NamingContext.java2001/09/18 22:28:57 1.3.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.3 2001/02/16 00:05:54 remm Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/02/16 00:05:54 $
  + * $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 $
*
* 
*
  @@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
  - * @version $Revision: 1.3 $ $Date: 2001/02/16 00:05:54 $
  + * @version $Revision: 1.3.2.1 $ $Date: 2001/09/18 22:28:57 $
*/
   
   public class NamingContext implements Context {
  @@ -536,7 +536,7 @@
*/
   public void destroySubcontext(String name)
   throws NamingException {
  -destroySubcontext(name);
  +destroySubcontext(new CompositeName(name));
   }

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2001-09-18 Thread remm 

remm01/09/18 15:30:01

  Modified:catalina/src/share/org/apache/naming NamingContext.java
  Log:
  - Fix bug 3699 - A recursive function call in org.apache.naming.NamingContext.
Patch submitted by ygary2 at yahoo.com (sorry I couldn't find your name anywhere).
  
  Revision  ChangesPath
  1.4   +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
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NamingContext.java2001/02/16 00:05:54 1.3
  +++ NamingContext.java2001/09/18 22:30:01 1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.3 2001/02/16 00:05:54 remm Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/02/16 00:05:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.4 2001/09/18 22:30:01 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/09/18 22:30:01 $
*
* 
*
  @@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
  - * @version $Revision: 1.3 $ $Date: 2001/02/16 00:05:54 $
  + * @version $Revision: 1.4 $ $Date: 2001/09/18 22:30:01 $
*/
   
   public class NamingContext implements Context {
  @@ -536,7 +536,7 @@
*/
   public void destroySubcontext(String name)
   throws NamingException {
  -destroySubcontext(name);
  +destroySubcontext(new CompositeName(name));
   }

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2001-02-15 Thread remm 

remm01/02/15 16:05:57

  Modified:catalina/src/share/org/apache/naming NamingContext.java
  Log:
  - Call NamingManager.getStateToBind before binding the object.
  
  Revision  ChangesPath
  1.3   +17 -15
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamingContext.java2000/12/15 19:48:25 1.2
  +++ NamingContext.java2001/02/16 00:05:54 1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.2 2000/12/15 19:48:25 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/12/15 19:48:25 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.3 2001/02/16 00:05:54 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/02/16 00:05:54 $
*
* 
*
  @@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2000/12/15 19:48:25 $
  + * @version $Revision: 1.3 $ $Date: 2001/02/16 00:05:54 $
*/
   
   public class NamingContext implements Context {
  @@ -850,7 +850,7 @@
* must already exist.
* 
* @param name the name to bind; may not be empty
  - * @param obj the object to bind; possibly null
  + * @param object the object to bind; possibly null
* @param rebind if true, then perform a rebind (ie, overwrite)
* @exception NameAlreadyBoundException if name is already bound
* @exception InvalidAttributesException if object did not supply all 
  @@ -892,21 +892,23 @@
   } else {
   // Getting the type of the object and wrapping it within a new
   // NamingEntry
  -if (obj instanceof Context) {
  -entry = new NamingEntry(name.get(0), obj, 
  +Object toBind = 
  +NamingManager.getStateToBind(obj, name, this, env);
  +if (toBind instanceof Context) {
  +entry = new NamingEntry(name.get(0), toBind, 
   NamingEntry.CONTEXT);
  -} else if (obj instanceof LinkRef) {
  -entry = new NamingEntry(name.get(0), obj, 
  +} else if (toBind instanceof LinkRef) {
  +entry = new NamingEntry(name.get(0), toBind, 
   NamingEntry.LINK_REF);
  -} else if (obj instanceof Reference) {
  -entry = new NamingEntry(name.get(0), obj, 
  +} else if (toBind instanceof Reference) {
  +entry = new NamingEntry(name.get(0), toBind, 
   NamingEntry.REFERENCE);
  -} else if (obj instanceof Referenceable) {
  -obj = ((Referenceable) obj).getReference();
  -entry = new NamingEntry(name.get(0), obj, 
  +} else if (toBind instanceof Referenceable) {
  +toBind = ((Referenceable) toBind).getReference();
  +entry = new NamingEntry(name.get(0), toBind, 
   NamingEntry.REFERENCE);
   } else {
  -entry = new NamingEntry(name.get(0), obj, 
  +entry = new NamingEntry(name.get(0), toBind, 
   NamingEntry.ENTRY);
   }
   bindings.put(name.get(0), entry);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming NamingContext.java

2000-12-15 Thread remm 

remm00/12/15 11:48:26

  Modified:catalina/src/share/org/apache/naming NamingContext.java
  Log:
  - Fix a NPE if the NamingContext was initialized with an environment.
Submitted by Tom Klaasen Tom.Klaasen at the-ecorp.com.
  
  Revision  ChangesPath
  1.2   +4 -3  
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NamingContext.java2000/11/02 06:14:16 1.1
  +++ NamingContext.java2000/12/15 19:48:25 1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.1 2000/11/02 06:14:16 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/11/02 06:14:16 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v 
1.2 2000/12/15 19:48:25 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2000/12/15 19:48:25 $
*
* 
*
  @@ -85,7 +85,7 @@
* Catalina JNDI Context implementation.
*
* @author Remy Maucherat
  - * @version $Revision: 1.1 $ $Date: 2000/11/02 06:14:16 $
  + * @version $Revision: 1.2 $ $Date: 2000/12/15 19:48:25 $
*/
   
   public class NamingContext implements Context {
  @@ -109,6 +109,7 @@
   public NamingContext(Hashtable env, String name) 
   throws NamingException {
   this.bindings = new Hashtable();
  +this.env = new Hashtable();
   // FIXME ? Could be put in the environment ?
   this.name = name;
   // Populating the environment hashtable