[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.28-20-g0cc65fc

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

commit 0cc65fce0f69854255d2798d93c7ff11a08be0ce
Author: Ceki Gulcu <ceki at qos.ch>
Date:   Mon Mar 7 23:50:30 2011 +0100

    make tests pass

diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java
index acf427b..d8e5a80 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/LogbackMDCAdapter.java
@@ -85,7 +85,7 @@ public class LogbackMDCAdapter implements MDCAdapter {
     HashMap<String, String> oldMap = copyOnInheritThreadLocal.get();
     Integer lastOp = getAndSetLastOperation(WRITE_OPERATION);
 
-    if(lastOp == null || lastOp.intValue() == READ_OPERATION) {
+    if(lastOp == null || lastOp.intValue() == READ_OPERATION || oldMap ==  null) {
       HashMap<String, String> newMap = new HashMap<String, String>();
       if (oldMap != null) {
         newMap.putAll(oldMap);
diff --git a/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/GafferConfiguratorTest.groovy b/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/GafferConfiguratorTest.groovy
index 7d52d73..c36d936 100644
--- a/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/GafferConfiguratorTest.groovy
+++ b/logback-classic/src/test/groovy/ch/qos/logback/classic/gaffer/GafferConfiguratorTest.groovy
@@ -157,14 +157,4 @@ class GafferConfiguratorTest {
     assertTrue ca.isStarted()
     assertEquals("HELLO %m%n", ca.encoder.getLayout().pattern)
   }
-
-  @Test
-  void p() {
-    context.putProperty("p", "HELLO");
-      File file = new File(ClassicTestConstants.GAFFER_INPUT_PREFIX + "x.groovy")
-      String dslText = file.text
-      configurator.run dslText
-      StatusPrinter.print(context)
-
-  }
 }
diff --git a/pom.xml b/pom.xml
index ea8959e..514ea01 100755
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
     <junit.version>4.8.2</junit.version>
     <janino.version>2.5.10</janino.version>
     <scala.version>2.7.7</scala.version>
-    <groovy.version>1.7.8</groovy.version>
+    <groovy.version>1.7.6</groovy.version>
     <surefire.version>2.6</surefire.version>
     <consolePlugin.version>1.1.0</consolePlugin.version>  
   </properties>

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

Summary of changes:
 .../logback/classic/util/LogbackMDCAdapter.java    |    2 +-
 .../classic/gaffer/GafferConfiguratorTest.groovy   |   10 ----------
 pom.xml                                            |    2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)


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