From 1c3757b432ce95630dd5e3c8a815ac83dcd7594c Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Mon, 10 Jun 2013 14:23:45 +0200
Subject: [PATCH] Log if event to be send is NULL
---
.../arsnova/services/UserSessionServiceImpl.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java b/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java
index 1f0e1dcf..e10a7b6c 100644
--- a/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java
@@ -3,6 +3,8 @@ package de.thm.arsnova.services;
import java.io.Serializable;
import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.stereotype.Component;
@@ -17,6 +19,8 @@ import de.thm.arsnova.socket.ARSnovaSocketIOServer;
@Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
public class UserSessionServiceImpl implements UserSessionService, Serializable {
private static final long serialVersionUID = 1L;
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(UserSessionServiceImpl.class);
private User user;
private Session session;
@@ -58,10 +62,15 @@ public class UserSessionServiceImpl implements UserSessionService, Serializable
@Override
public void sendEventViaWebSocket(ARSnovaSocketIOServer server, ARSnovaEvent event) {
+ if (event == null) {
+ LOGGER.info("Trying to send NULL event");
+ return;
+ }
+
if (
event.getDestinationType() == Destination.SESSION
&& hasConnectedWebSocket()
- && event != null && session != null
+ && session != null
&& event.getSessionKey().equals(session.getKeyword())
) {
server.sendToClient(getSocketId(), event);
@@ -70,7 +79,7 @@ public class UserSessionServiceImpl implements UserSessionService, Serializable
if (
event.getDestinationType() == Destination.USER
&& hasConnectedWebSocket()
- && event != null && user != null
+ && user != null
&& event.getRecipient().getUsername().equals(user.getUsername())
) {
server.sendToClient(getSocketId(), event);
--
GitLab