Return-Path: 
 <commits-return-2546-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
X-Original-To: apmail-logging-commits-archive@minotaur.apache.org
Delivered-To: apmail-logging-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 56A1B1087E
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Tue,  9 Jul 2013 18:13:25 +0000 (UTC)
Received: (qmail 83328 invoked by uid 500); 9 Jul 2013 18:13:25 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 83305 invoked by uid 500); 9 Jul 2013 18:13:23 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 83266 invoked by uid 99); 9 Jul 2013 18:13:16 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 18:13:16 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 18:13:14 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 40E3E23888A6;
	Tue,  9 Jul 2013 18:12:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1501415 -
 /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
Date: Tue, 09 Jul 2013 18:12:53 -0000
To: commits@logging.apache.org
From: ggregory@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130709181253.40E3E23888A6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ggregory
Date: Tue Jul  9 18:12:52 2013
New Revision: 1501415

URL: http://svn.apache.org/r1501415
Log:
Simplify config processing.

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1501415&r1=1501414&r2=1501415&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Tue Jul  9 18:12:52 2013
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.core.con
 import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 import org.apache.logging.log4j.core.helpers.Constants;
-import org.apache.logging.log4j.core.helpers.Strings;
 
 /**
  * The FailoverAppender will capture exceptions in an Appender and then route the event
@@ -45,7 +44,7 @@ import org.apache.logging.log4j.core.hel
 @Plugin(name = "Failover", category = "Core", elementType = "appender", printObject = true)
 public final class FailoverAppender<T extends Serializable> extends AbstractAppender<T> {
 
-    private static final int DEFAULT_INTERVAL_MILLIS = 60 * Constants.MILLIS_IN_SECONDS;
+    private static final int DEFAULT_INTERVAL_SECONDS = 60;
 
     private final String primaryRef;
 
@@ -206,22 +205,13 @@ public final class FailoverAppender<T ex
             return null;
         }
 
+        final int seconds = parseInt(intervalSeconds, DEFAULT_INTERVAL_SECONDS);
         int retryIntervalMillis;
-        if (Strings.isEmpty(intervalSeconds)) {
-            retryIntervalMillis = DEFAULT_INTERVAL_MILLIS;
+        if (seconds >= 0) {
+            retryIntervalMillis = seconds * Constants.MILLIS_IN_SECONDS;
         } else {
-            try {
-                final int seconds = Integer.parseInt(intervalSeconds);
-                if (seconds >= 0) {
-                    retryIntervalMillis = seconds * Constants.MILLIS_IN_SECONDS;
-                } else {
-                    LOGGER.warn("Interval " + intervalSeconds + " is less than zero. Using default");
-                    retryIntervalMillis = DEFAULT_INTERVAL_MILLIS;
-                }
-            } catch (final NumberFormatException nfe) {
-                LOGGER.error("Interval " + intervalSeconds + " is non-numeric. Using default");
-                retryIntervalMillis = DEFAULT_INTERVAL_MILLIS;
-            }
+            LOGGER.warn("Interval " + intervalSeconds + " is less than zero. Using default");
+            retryIntervalMillis = DEFAULT_INTERVAL_SECONDS * Constants.MILLIS_IN_SECONDS;
         }
 
         final boolean handleExceptions = suppress == null ? true : Boolean.valueOf(suppress);