From 402bf37504f874dae3d311c3da7e497450537b27 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Mon, 17 Jul 2017 16:36:56 +0200
Subject: [PATCH] Fix registration of Bean for socket event handling
Fixes a regression introduced by commit
2ecbfec8b1676781a57f8622908af7cc44abfd48.
---
src/main/java/de/thm/arsnova/config/AppConfig.java | 6 ++++++
.../java/de/thm/arsnova/socket/ARSnovaSocketListener.java | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/config/AppConfig.java b/src/main/java/de/thm/arsnova/config/AppConfig.java
index 43cb0b5d0..ab92d140c 100644
--- a/src/main/java/de/thm/arsnova/config/AppConfig.java
+++ b/src/main/java/de/thm/arsnova/config/AppConfig.java
@@ -32,6 +32,7 @@ import de.thm.arsnova.persistance.couchdb.*;
import de.thm.arsnova.persistance.couchdb.InitializingCouchDbConnector;
import de.thm.arsnova.socket.ARSnovaSocket;
import de.thm.arsnova.socket.ARSnovaSocketIOServer;
+import de.thm.arsnova.socket.ARSnovaSocketListener;
import de.thm.arsnova.web.CacheControlInterceptorHandler;
import de.thm.arsnova.web.CorsFilter;
import de.thm.arsnova.web.DeprecatedApiInterceptorHandler;
@@ -270,6 +271,11 @@ public class AppConfig extends WebMvcConfigurerAdapter {
return socketServer;
}
+ @Bean
+ public ARSnovaSocketListener arsnovaSocketListener() {
+ return new ARSnovaSocketListener();
+ }
+
@Bean
public CacheManager cacheManager() {
return new ConcurrentMapCacheManager();
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketListener.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketListener.java
index 629b038c1..6c740888f 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketListener.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketListener.java
@@ -21,13 +21,13 @@ import de.thm.arsnova.events.NovaEvent;
import de.thm.arsnova.events.NovaEventVisitor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
/**
* An external Listener is required because otherwise the event methods are not called through a Spring proxy.
* This would result in Spring method annotations not working.
*/
-@Service
+@Component
public class ARSnovaSocketListener implements ApplicationListener<NovaEvent> {
@Autowired
--
GitLab