You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/05/27 17:23:35 UTC

cvs commit: jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log LogService.java

vmassol     02/05/27 08:23:35

  Modified:    framework/src/java/share/org/apache/cactus/util
                        JUnitVersionHelper.java
               framework/src/java/share/org/apache/cactus/util/log
                        LogService.java
  Log:
  corrected checkstyle errors
  
  Revision  Changes    Path
  1.4       +4 -2      jakarta-cactus/framework/src/java/share/org/apache/cactus/util/JUnitVersionHelper.java
  
  Index: JUnitVersionHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/util/JUnitVersionHelper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JUnitVersionHelper.java	12 May 2002 18:26:54 -0000	1.3
  +++ JUnitVersionHelper.java	27 May 2002 15:23:35 -0000	1.4
  @@ -68,7 +68,7 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: JUnitVersionHelper.java,v 1.3 2002/05/12 18:26:54 vmassol Exp $
  + * @version $Id: JUnitVersionHelper.java,v 1.4 2002/05/27 15:23:35 vmassol Exp $
    */
   public class JUnitVersionHelper
   {
  @@ -105,7 +105,9 @@
           if (theTest instanceof TestCase && testCaseName != null) {
               try {
                   return (String) testCaseName.invoke(theTest, new Object[0]);
  -            } catch (Throwable e) {}
  +            } catch (Throwable e) {
  +                // If it fails, we return "unknown"
  +            }
           }
           return "unknown";
       }
  
  
  
  1.5       +3 -2      jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/LogService.java
  
  Index: LogService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/util/log/LogService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LogService.java	14 Apr 2002 15:56:27 -0000	1.4
  +++ LogService.java	27 May 2002 15:23:35 -0000	1.5
  @@ -69,7 +69,7 @@
    *
    * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
    *
  - * @version $Id: LogService.java,v 1.4 2002/04/14 15:56:27 vmassol Exp $
  + * @version $Id: LogService.java,v 1.5 2002/05/27 15:23:35 vmassol Exp $
    */
   public class LogService
   {
  @@ -180,11 +180,12 @@
        */
       private boolean isLog4jInClasspath()
       {
  -        boolean isLog4jInClasspath = false;
  +        boolean isLog4jInClasspath;
           try {
               Class.forName("org.apache.log4j.PropertyConfigurator");
               isLog4jInClasspath = true;
           } catch (ClassNotFoundException e) {
  +            isLog4jInClasspath = false;
           }
           return isLog4jInClasspath;
       }
  
  
  

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