remm        2003/05/29 09:19:54

  Modified:    catalina/src/share/org/apache/naming LocalStrings.properties
                        LocalStrings_fr.properties NamingContext.java
  Log:
  - Add logging of unexpected exceptions occuring during reference resolution.
  
  Revision  Changes    Path
  1.2       +1 -0      
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/LocalStrings.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalStrings.properties   18 Jul 2002 16:47:31 -0000      1.1
  +++ LocalStrings.properties   29 May 2003 16:19:53 -0000      1.2
  @@ -3,6 +3,7 @@
   contextBindings.noContextBoundToCL=No naming context bound to this class loader
   selectorContext.noJavaUrl=This context must be accessed throught a java: URL
   namingContext.contextExpected=Name is not bound to a Context
  +namingContext.failResolvingReference=Unexpected exception resolving reference
   namingContext.nameNotBound=Name {0} is not bound in this Context
   namingContext.readOnly=Context is read only
   namingContext.invalidName=Name is not valid
  
  
  
  1.2       +1 -0      
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/LocalStrings_fr.properties
  
  Index: LocalStrings_fr.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/LocalStrings_fr.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalStrings_fr.properties        5 Nov 2002 09:35:48 -0000       1.1
  +++ LocalStrings_fr.properties        29 May 2003 16:19:53 -0000      1.2
  @@ -3,6 +3,7 @@
   contextBindings.noContextBoundToCL=Aucun Contexte de nommage lié à ce chargeur de 
classes
   selectorContext.noJavaUrl=Ce Contexte doit être accédé par une java: URL
   namingContext.contextExpected=Le Nom n''est pas lié à un Contexte
  +namingContext.failResolvingReference=Une erreur s est produite durant la résolution 
de la référence
   namingContext.nameNotBound=Le Nom {0} n''est pas lié à ce Contexte
   namingContext.readOnly=Le Contexte est en lecture seule
   namingContext.invalidName=Le Nom est invalide
  
  
  
  1.2       +10 -5     
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java
  
  Index: NamingContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NamingContext.java        18 Jul 2002 16:47:31 -0000      1.1
  +++ NamingContext.java        29 May 2003 16:19:53 -0000      1.2
  @@ -87,7 +87,6 @@
    * @author Remy Maucherat
    * @version $Revision$ $Date$
    */
  -
   public class NamingContext implements Context {
   
   
  @@ -100,6 +99,10 @@
       protected static final NameParser nameParser = new NameParserImpl();
   
   
  +    private static org.apache.commons.logging.Log log =
  +        org.apache.commons.logging.LogFactory.getLog(NamingContext.class);
  +
  +
       // ----------------------------------------------------------- Constructors
   
   
  @@ -841,6 +844,8 @@
                   } catch (NamingException e) {
                       throw e;
                   } catch (Exception e) {
  +                    log.warn(sm.getString
  +                             ("namingContext.failResolvingReference"), e);
                       throw new NamingException(e.getMessage());
                   }
               } else {
  
  
  

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

Reply via email to