You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/10/17 18:49:30 UTC

cvs commit: jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory MemoryNamingContext.java

costin      2002/10/17 09:49:30

  Modified:    naming/src/org/apache/naming/modules/memory
                        MemoryNamingContext.java
  Log:
  Fix lookup signature
  
  Revision  Changes    Path
  1.3       +3 -4      jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory/MemoryNamingContext.java
  
  Index: MemoryNamingContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/naming/src/org/apache/naming/modules/memory/MemoryNamingContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MemoryNamingContext.java	8 Oct 2002 18:46:43 -0000	1.2
  +++ MemoryNamingContext.java	17 Oct 2002 16:49:30 -0000	1.3
  @@ -107,7 +107,6 @@
        */
       protected Hashtable bindings;
   
  -
       public void setBindings( Hashtable bindings ) {
           this.bindings = bindings;
       }
  @@ -273,7 +272,7 @@
       }
   
       // XXX Make it iterative, less objects
  -    private NamingEntry findNamingEntry(Name name, boolean resolveLinks, Object o)
  +    private NamingEntry findNamingEntry(Name name, boolean resolveLinks)
           throws NamingException
       {
            if (name.isEmpty()) {
  @@ -304,14 +303,14 @@
           }
       }
   
  -    public Object lookup(Name name, boolean resolveLinks, Object o)
  +    public Object lookup(Name name, boolean resolveLinks)
           throws NamingException
       {
           // Removing empty parts
           while ((!name.isEmpty()) && (name.get(0).length() == 0))
               name = name.getSuffix(1);
           
  -        NamingEntry entry=findNamingEntry( name, resolveLinks, o );
  +        NamingEntry entry=findNamingEntry( name, resolveLinks );
   
           if( entry.type == NamingEntry.CONTEXT ) {
               return ((BaseDirContext) entry.value).lookup(name.getSuffix(1), resolveLinks, o);
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>