[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.25-6-gc978343

[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  c97834304048203d7d66de6ee174481f6991c293 (commit)
      from  efb61ffd8c45339463e99235c4f3f002f542c683 (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=c97834304048203d7d66de6ee174481f6991c293
http://github.com/ceki/logback/commit/c97834304048203d7d66de6ee174481f6991c293

commit c97834304048203d7d66de6ee174481f6991c293
Author: Ceki Gulcu <ceki at qos.ch>
Date:   Fri Oct 15 00:10:15 2010 +0200

    InetAdress.canonicalHostName is not necessarily the same as InetHost.hostname

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 f7d8fe3..89e1c2a 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
@@ -67,8 +67,8 @@ public class ConditionalTest {
   public void conditionalConsoleApp_IF_THEN_True() throws JoranException,
           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());
+    System.out.println("In conditionalConsoleApp_IF_THEN_True, canonicalHostName=\"" + localhost.getCanonicalHostName() + "] and hostNmae=\"" + localhost.getHostName() + "\"");
+    context.putProperty("aHost", localhost.getHostName());
 
     String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX
             + "conditional/conditionalConsoleApp.xml";

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

Summary of changes:
 .../classic/joran/conditional/ConditionalTest.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


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