cvs commit: jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet InitServlet.java InitContextListener.java ConfigurationServlet.java

[mwomack]

mwomack     2003/03/19 23:19:24

  Modified:    src/java/org/apache/log4j/servlet InitServlet.java
                        InitContextListener.java ConfigurationServlet.java
  Log:
  Jalopy-ized & checkstyled versions.
  
  Revision  Changes    Path
  1.6       +2 -0      
jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/InitServlet.java
  
  Index: InitServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/InitServlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InitServlet.java  28 Feb 2003 05:10:12 -0000      1.5
  +++ InitServlet.java  20 Mar 2003 07:19:24 -0000      1.6
  @@ -223,6 +223,7 @@
                   } catch (NumberFormatException nfe) {
                     //ignore...we just won't use configureAndWatch if there is no
                     //valid int
  +                  ;
                   }
                 }
   
  @@ -282,6 +283,7 @@
                 log4jURL = getServletContext().getResource("/" + configPath);
               } catch (MalformedURLException murle) {
                 //ignore...we check for null later
  +              ;
               }
   
               if (log4jURL != null) {
  
  
  
  1.6       +2 -0      
jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/InitContextListener.java
  
  Index: InitContextListener.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/InitContextListener.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InitContextListener.java  28 Feb 2003 05:10:12 -0000      1.5
  +++ InitContextListener.java  20 Mar 2003 07:19:24 -0000      1.6
  @@ -345,6 +345,7 @@
                 } catch (NumberFormatException nfe) {
                   //ignore...we just won't use configureAndWatch if there is no
                   //valid int
  +                ;
                 }
               }
   
  @@ -391,6 +392,7 @@
               log4jURL = context.getResource("/" + configPath);
             } catch (MalformedURLException murle) {
               //ignore...we check for null later
  +            ;
             }
   
             if (log4jURL != null) {
  
  
  
  1.4       +1 -5      
jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/ConfigurationServlet.java
  
  Index: ConfigurationServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/servlet/ConfigurationServlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConfigurationServlet.java 28 Feb 2003 05:10:12 -0000      1.3
  +++ ConfigurationServlet.java 20 Mar 2003 07:19:24 -0000      1.4
  @@ -339,11 +339,7 @@
        * @return a <code>boolean</code> value
        */
       public boolean equals(Object o) {
  -      if (o instanceof LoggerComparator) {
  -        return true;
  -      } else {
  -        return false;
  -      }
  +      return (o instanceof LoggerComparator);
       }
     }
   }
  
  
  

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