Author: ceki Date: Thu Oct 4 15:29:47 2007 New Revision: 1599 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/LayoutBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java Log: fixing bugs found by FindBugs Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/BasicStatusManager.java Thu Oct 4 15:29:47 2007 @@ -19,7 +19,7 @@ public class BasicStatusManager implements StatusManager { - public static int MAX_COUNT = 200; + public static final int MAX_COUNT = 200; int count = 0; List<Status> statusList = new ArrayList<Status>(); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/LayoutBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/LayoutBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/LayoutBase.java Thu Oct 4 15:29:47 2007 @@ -13,7 +13,6 @@ abstract public class LayoutBase<E> extends ContextAwareBase implements Layout<E> { - Context context; protected boolean started; String fileHeader; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/StatusPrinter.java Thu Oct 4 15:29:47 2007 @@ -34,9 +34,10 @@ if (sm == null) { ps.println("WARN: Context named \"" + context.getName() + "\" has no status manager"); + } else { + print(sm); } - print(sm); } public static void print(StatusManager sm) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/TouchAction.java Thu Oct 4 15:29:47 2007 @@ -20,7 +20,7 @@ public class TouchAction extends Action { - public static String KEY = "touched"; + public static final String KEY = "touched"; public TouchAction() { }