[Lilith-devel] SF.net SVN: lilith:[293] trunk/logback

[<hu...@us...>]

Revision: 293
          http://lilith.svn.sourceforge.net/lilith/?rev=293&view=rev
Author:   huxhorn
Date:     2009-07-19 22:42:29 +0000 (Sun, 19 Jul 2009)

Log Message:
-----------
Fixes ticket:39. I missed two places, first.

Modified Paths:
--------------
    trunk/logback/event-producers/src/main/java/de/huxhorn/lilith/logback/producer/LogbackLoggingStreamEventProducer.java
    trunk/logback/logging-adapter/src/main/java/de/huxhorn/lilith/data/logging/logback/LogbackLoggingAdapter.java

Modified: trunk/logback/event-producers/src/main/java/de/huxhorn/lilith/logback/producer/LogbackLoggingStreamEventProducer.java
===================================================================
--- trunk/logback/event-producers/src/main/java/de/huxhorn/lilith/logback/producer/LogbackLoggingStreamEventProducer.java	2009-07-19 11:01:17 UTC (rev 292)
+++ trunk/logback/event-producers/src/main/java/de/huxhorn/lilith/logback/producer/LogbackLoggingStreamEventProducer.java	2009-07-19 22:42:29 UTC (rev 293)
@@ -27,29 +27,24 @@
 import java.io.InputStream;
 
 public class LogbackLoggingStreamEventProducer
-	extends AbstractLogbackStreamEventProducer<LoggingEvent>
-{
-	private LogbackLoggingAdapter adapter;
+        extends AbstractLogbackStreamEventProducer<LoggingEvent> {
+    private LogbackLoggingAdapter adapter;
 
-	public LogbackLoggingStreamEventProducer(SourceIdentifier sourceIdentifier, AppendOperation<EventWrapper<LoggingEvent>> eventQueue, InputStream inputStream)
-		throws IOException
-	{
-		super(sourceIdentifier, eventQueue, inputStream);
-		adapter = new LogbackLoggingAdapter();
-	}
+    public LogbackLoggingStreamEventProducer(SourceIdentifier sourceIdentifier, AppendOperation<EventWrapper<LoggingEvent>> eventQueue, InputStream inputStream)
+            throws IOException {
+        super(sourceIdentifier, eventQueue, inputStream);
+        adapter = new LogbackLoggingAdapter();
+    }
 
-	protected LoggingEvent postprocessEvent(Object o)
-	{
-		if(o instanceof ch.qos.logback.classic.spi.LoggingEvent)
-		{
-			ch.qos.logback.classic.spi.LoggingEvent logbackEvent = (ch.qos.logback.classic.spi.LoggingEvent) o;
-			return adapter.convert(logbackEvent, false);
-		}
-		if(logger.isInfoEnabled())
-		{
-			logger.info("Retrieved {} instead of ch.qos.logback.classic.spi.LoggingEvent.", o == null ? null : o
-				.getClass().getName());
-		}
-		return null;
-	}
+    protected LoggingEvent postprocessEvent(Object o) {
+        if (o instanceof ch.qos.logback.classic.spi.ILoggingEvent) {
+            ch.qos.logback.classic.spi.ILoggingEvent logbackEvent = (ch.qos.logback.classic.spi.ILoggingEvent) o;
+            return adapter.convert(logbackEvent, false);
+        }
+        if (logger.isInfoEnabled()) {
+            logger.info("Retrieved {} instead of ch.qos.logback.classic.spi.ILoggingEvent.", o == null ? null : o
+                    .getClass().getName());
+        }
+        return null;
+    }
 }

Modified: trunk/logback/logging-adapter/src/main/java/de/huxhorn/lilith/data/logging/logback/LogbackLoggingAdapter.java
===================================================================
--- trunk/logback/logging-adapter/src/main/java/de/huxhorn/lilith/data/logging/logback/LogbackLoggingAdapter.java	2009-07-19 11:01:17 UTC (rev 292)
+++ trunk/logback/logging-adapter/src/main/java/de/huxhorn/lilith/data/logging/logback/LogbackLoggingAdapter.java	2009-07-19 22:42:29 UTC (rev 293)
@@ -27,7 +27,7 @@
 import java.util.Map;
 
 public class LogbackLoggingAdapter {
-    public LoggingEvent convert(ch.qos.logback.classic.spi.LoggingEvent event, boolean inSameThread) {
+    public LoggingEvent convert(ch.qos.logback.classic.spi.ILoggingEvent event, boolean inSameThread) {
         if (event == null) {
             return null;
         }
@@ -42,8 +42,9 @@
         if (argumentResult != null) {
             arguments = argumentResult.getArguments();
             Throwable t = argumentResult.getThrowable();
-            if (t != null && event.getThrowableProxy() == null) {
-                event.setThrowableProxy(new ThrowableProxy(t));
+            if (t != null && event.getThrowableProxy() == null && event instanceof ch.qos.logback.classic.spi.LoggingEvent) {
+                ch.qos.logback.classic.spi.LoggingEvent le = (ch.qos.logback.classic.spi.LoggingEvent) event;
+                le.setThrowableProxy(new ThrowableProxy(t));
             }
         }
         if (messagePattern != null || arguments != null) {
@@ -164,7 +165,7 @@
         return result;
     }
 
-    private void initMarker(ch.qos.logback.classic.spi.LoggingEvent src, LoggingEvent dst) {
+    private void initMarker(ch.qos.logback.classic.spi.ILoggingEvent src, LoggingEvent dst) {
         org.slf4j.Marker origMarker = src.getMarker();
         if (origMarker == null) {
             return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.