[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.29-23-g039eb9e

[added by portage for gitosis-gentoo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Logback: the generic, reliable, fast and flexible logging framework.".

The branch, master has been updated
       via  039eb9e9b9987b36f4e44fdab7967aea71810cd2 (commit)
      from  524e0fc13ecc4fb24d1e2515adc47d8711cf3654 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=039eb9e9b9987b36f4e44fdab7967aea71810cd2
http://github.com/ceki/logback/commit/039eb9e9b9987b36f4e44fdab7967aea71810cd2

commit 039eb9e9b9987b36f4e44fdab7967aea71810cd2
Author: Ceki Gulcu <ceki at qos.ch>
Date:   Wed Sep 7 23:36:59 2011 +0200

    minor improvements

diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
index 49101f8..1947c84 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java
@@ -31,7 +31,7 @@ public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends
   @Override
   public void start() {
     super.start();
-    archiveRemover = new TimeBasedArchiveRemover(tbrp.fileNamePattern, rc, getCurrentTime());
+    archiveRemover = new TimeBasedArchiveRemover(tbrp.fileNamePattern, rc);
     archiveRemover.setContext(context);
     started = true;
   }
diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java
index 128de48..352f5ac 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java
@@ -47,6 +47,8 @@ abstract public class DefaultArchiveRemover extends ContextAwareBase implements
     long periodsElapsed = 0;
     if (lastHeartBeat == UNINITIALIZED) {
       periodsElapsed = rc.periodsElapsed(nowInMillis, nowInMillis + INACTIVITY_TOLERANCE_IN_MILLIS);
+      if (periodsElapsed > MAX_VALUE_FOR_INACTIVITY_PERIODS)
+        periodsElapsed = MAX_VALUE_FOR_INACTIVITY_PERIODS;
     } else {
       periodsElapsed = rc.periodsElapsed(lastHeartBeat, nowInMillis);
       if (periodsElapsed < 1) {
@@ -54,8 +56,6 @@ abstract public class DefaultArchiveRemover extends ContextAwareBase implements
         periodsElapsed = 1;
       }
     }
-    if (periodsElapsed > MAX_VALUE_FOR_INACTIVITY_PERIODS)
-      periodsElapsed = MAX_VALUE_FOR_INACTIVITY_PERIODS;
     return (int) periodsElapsed;
   }
 
diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
index a79f481..a44b65a 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java
@@ -24,7 +24,7 @@ import org.codehaus.groovy.tools.shell.util.NoExitSecurityManager;
 public class TimeBasedArchiveRemover extends DefaultArchiveRemover {
 
   public TimeBasedArchiveRemover(FileNamePattern fileNamePattern,
-                                 RollingCalendar rc, long currentTime) {
+                                 RollingCalendar rc) {
     super(fileNamePattern, rc);
   }
 

-----------------------------------------------------------------------

Summary of changes:
 ...aultTimeBasedFileNamingAndTriggeringPolicy.java |    2 +-
 .../core/rolling/helper/DefaultArchiveRemover.java |    4 ++--
 .../rolling/helper/TimeBasedArchiveRemover.java    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Logback: the generic, reliable, fast and flexible logging framework.