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 abddd6ec3904fb8d2fce0ee59a0c1f27ba174b49 (commit) from 829d2fd4841611d239af073e7900c86b09e177b6 (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=abddd6ec3904fb8d2fce0ee59... http://github.com/ceki/logback/commit/abddd6ec3904fb8d2fce0ee59a0c1f27ba174b... commit abddd6ec3904fb8d2fce0ee59a0c1f27ba174b49 Author: Ceki Gulcu <ceki@qos.ch> Date: Thu Oct 14 23:28:27 2010 +0200 trying to hunt down LBCLASSIC-223 diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java index dcb46b5..f7d8fe3 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java @@ -1,13 +1,13 @@ /** * Logback: the reliable, generic, fast and flexible logging framework. * Copyright (C) 1999-2010, QOS.ch. All rights reserved. - * + * * This program and the accompanying materials are dual-licensed under either * the terms of the Eclipse Public License v1.0 as published by the Eclipse * Foundation - * + * * or (per the licensee's choosing) - * + * * under the terms of the GNU Lesser General Public License version 2.1 as * published by the Free Software Foundation. */ @@ -65,12 +65,13 @@ public class ConditionalTest { @Test public void conditionalConsoleApp_IF_THEN_True() throws JoranException, - IOException, InterruptedException { + IOException, InterruptedException { InetAddress localhost = InetAddress.getLocalHost(); + System.out.println("In conditionalConsoleApp_IF_THEN_True, setting property aHost as [" + localhost.getCanonicalHostName() + "]"); context.putProperty("aHost", localhost.getCanonicalHostName()); String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "conditional/conditionalConsoleApp.xml"; + + "conditional/conditionalConsoleApp.xml"; configure(configFileAsStr); FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); assertNotNull(fileAppender); @@ -83,10 +84,10 @@ public class ConditionalTest { @Test public void conditionalConsoleApp_IF_THEN_False() throws JoranException, - IOException, InterruptedException { + IOException, InterruptedException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "conditional/conditionalConsoleApp.xml"; + + "conditional/conditionalConsoleApp.xml"; configure(configFileAsStr); FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); assertNotNull(fileAppender); @@ -99,10 +100,10 @@ public class ConditionalTest { @Test public void conditionalConsoleApp_IF_THEN_ELSE() throws JoranException, - IOException, InterruptedException { + IOException, InterruptedException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "conditional/conditionalConsoleApp_ELSE.xml"; + + "conditional/conditionalConsoleApp_ELSE.xml"; configure(configFileAsStr); FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java index 5d08129..6c011d4 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java @@ -143,7 +143,7 @@ public class OptionHelper { if (i == 0) { // this is a simple string return val; - } else { // add the tail string which contails no variables and return + } else { // add the tail string which contains no variables and return // the result. sbuf.append(val.substring(i, val.length())); ----------------------------------------------------------------------- Summary of changes: .../classic/joran/conditional/ConditionalTest.java | 19 ++++++++++--------- .../ch/qos/logback/core/util/OptionHelper.java | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.