From 32cb1045bad88bcba7859ea46ef2785d4a168e4f Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 31 Jan 2013 09:35:21 -0700 Subject: [PATCH] Fixing logger name --- .../org/eclipse/jetty/websocket/common/events/EventDriver.java | 3 +-- .../jetty/websocket/common/events/ListenerEventDriver.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java index bd143ff1d96..d7acfcfe118 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java @@ -42,7 +42,7 @@ import org.eclipse.jetty.websocket.common.WebSocketSession; */ public abstract class EventDriver implements IncomingFrames { - protected final Logger LOG; + private static final Logger LOG = Log.getLogger(EventDriver.class); protected final WebSocketPolicy policy; protected final Object websocket; protected WebSocketSession session; @@ -51,7 +51,6 @@ public abstract class EventDriver implements IncomingFrames { this.policy = policy; this.websocket = websocket; - this.LOG = Log.getLogger(websocket.getClass()); } public WebSocketPolicy getPolicy() diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/ListenerEventDriver.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/ListenerEventDriver.java index 05f62846bae..07bad1a23c2 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/ListenerEventDriver.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/ListenerEventDriver.java @@ -21,6 +21,8 @@ package org.eclipse.jetty.websocket.common.events; import java.io.IOException; import java.nio.ByteBuffer; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.WebSocketListener; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.extensions.Frame; @@ -34,6 +36,7 @@ import org.eclipse.jetty.websocket.common.message.SimpleTextMessage; */ public class ListenerEventDriver extends EventDriver { + private static final Logger LOG = Log.getLogger(ListenerEventDriver.class); private final WebSocketListener listener; private MessageAppender activeMessage; private boolean hasCloseBeenCalled = false;