diff --git a/daytrader-ee7-web/src/main/java/com/ibm/websphere/samples/daytrader/web/websocket/MarketSummaryWebSocket.java b/daytrader-ee7-web/src/main/java/com/ibm/websphere/samples/daytrader/web/websocket/MarketSummaryWebSocket.java
index d081f32..b937379 100644
--- a/daytrader-ee7-web/src/main/java/com/ibm/websphere/samples/daytrader/web/websocket/MarketSummaryWebSocket.java
+++ b/daytrader-ee7-web/src/main/java/com/ibm/websphere/samples/daytrader/web/websocket/MarketSummaryWebSocket.java
@@ -49,7 +49,6 @@
 public class MarketSummaryWebSocket {
 
 	private static final Set<Session> sessions = Collections.synchronizedSet(new HashSet<Session>());
-    private Session currentSession = null;   
     private final CountDownLatch latch = new CountDownLatch(1);
 
     @OnOpen
@@ -59,12 +58,11 @@ public void onOpen(final Session session, EndpointConfig ec) {
         }
 
         sessions.add(session);
-        currentSession = session;
         latch.countDown();
     } 
     
     @OnMessage
-    public void sendMarketSummary(ActionMessage message) {
+    public void sendMarketSummary(ActionMessage message, Session currentSession) {
 
         String action = message.getDecodedAction();
         
@@ -106,7 +104,7 @@ public void sendMarketSummary(ActionMessage message) {
     }
 
     @OnError
-    public void onError(Throwable t) {
+    public void onError(Throwable t, Session currentSession) {
         if (Log.doTrace()) {
             Log.trace("MarketSummaryWebSocket:onError -- session -->" + currentSession + "<--");
         }