smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '49-fix-bug' into 'dev'

Browse source 
Fixed @tommi27 synchronization frenzy for sensors

Closes #49

See merge request sa4-2020/the-sanmarinoes/backend!61
This commit is contained in:
Claudio Maggioni 2020-03-25 17:28:11 +01:00
commit 334d35a4cc
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/socket/SensorSocketEndpoint.java
View file

@ -8,6 +8,8 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps; import com.google.common.collect.Multimaps;
import com.google.gson.Gson; import com.google.gson.Gson;
import java.io.IOException;
import java.util.*; import java.util.*;
import javax.websocket.*; import javax.websocket.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -57,20 +59,30 @@ public class SensorSocketEndpoint extends Endpoint {
* @param u the user to which to send the message * @param u the user to which to send the message
* @return number of successful transfer * @return number of successful transfer
*/ */
public long broadcast(Object message, User u) { public void broadcast(Object message, User u) {
final HashSet<Session> sessions = new HashSet<>(authorizedClients.get(u)); final HashSet<Session> sessions = new HashSet<>(authorizedClients.get(u));
return sessions.stream()
sessions.stream()
.filter( .filter(
s -> { s -> {
if (s.isOpen()) return true; if (s.isOpen()) return true;
sessions.remove(s); sessions.remove(s);
return false; return false;
}) })
.filter(didThrow(s -> s.getBasicRemote().sendText(gson.toJson(message)))) .forEach(s -> {
.count(); synchronized (this){
try {
s.getBasicRemote().sendText(gson.toJson(message));
} catch (IOException e) {
e.printStackTrace();
}
}
});
} }
/** /**
* Handles the opening of a socket session with a client * Handles the opening of a socket session with a client
* *