Revert pull request #335

NLog · May 7, 2014 · 8abcddd · 8abcddd
1 parent ff27bd3
commit 8abcddd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/NLog/LoggerImpl.cs b/src/NLog/LoggerImpl.cs
@@ -113,7 +113,7 @@ private static int FindCallingMethodOnStackTrace(StackTrace stackTrace, Type log
                     methodAssembly = mb.DeclaringType.Assembly;
                 }
 
-				if (SkipAssembly(methodAssembly) || (loggerType != null && mb.DeclaringType == loggerType))
+				if ((loggerType == null && SkipAssembly(methodAssembly)) || mb.DeclaringType == loggerType)
                 {
                     firstUserFrame = i + 1;
                 }

diff --git a/tests/NLog.UnitTests/NLogTestBase.cs b/tests/NLog.UnitTests/NLogTestBase.cs
@@ -71,7 +71,7 @@ public void AssertDebugLastMessageContains(string targetName, string msg)
 
             // Console.WriteLine("lastmsg: {0}", debugTarget.LastMessage);
 
-            Assert.Null(debugTarget);
+            Assert.NotNull(debugTarget);
             Assert.True(debugTarget.LastMessage.Contains(msg), "Unexpected last message value on '" + targetName + "'");
         }