tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory ResourceLinkFactory.java
Date Sat, 10 Nov 2001 00:28:39 GMT
remm        01/11/09 16:28:39

  Modified:    catalina/src/share/org/apache/naming/factory
                        ResourceLinkFactory.java
  Log:
  - Revert latest changes.
  
  Revision  Changes    Path
  1.3       +5 -23     jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java
  
  Index: ResourceLinkFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourceLinkFactory.java	2001/11/09 19:32:21	1.2
  +++ ResourceLinkFactory.java	2001/11/10 00:28:39	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java,v
1.2 2001/11/09 19:32:21 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/11/09 19:32:21 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceLinkFactory.java,v
1.3 2001/11/10 00:28:39 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/11/10 00:28:39 $
    *
    * ====================================================================
    *
  @@ -80,7 +80,7 @@
    * <p>Object factory for resource links.</p>
    * 
    * @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2001/11/09 19:32:21 $
  + * @version $Revision: 1.3 $ $Date: 2001/11/10 00:28:39 $
    */
   
   public class ResourceLinkFactory
  @@ -140,25 +140,7 @@
           if (refAddr != null) {
               globalName = refAddr.getContent().toString();
               Object result = null;
  -            try {
  -                result = globalContext.lookup(globalName);
  -            } catch (NamingException e) {
  -                // Ignore
  -            }
  -            if ((result == null) && (!globalName.startsWith("/comp"))) {
  -                try {
  -                    result = globalContext.lookup("/comp/" + globalName);
  -                } catch (NamingException e) {
  -                    // Ignore
  -                }
  -            }
  -            if ((result == null) && (!globalName.startsWith("/comp/env"))) {
  -                try {
  -                    result = globalContext.lookup("/comp/env/" + globalName);
  -                } catch (NamingException e) {
  -                    // Ignore
  -                }
  -            }
  +            result = globalContext.lookup(globalName);
               // FIXME: Check type
               return result;
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message