From f1b9807af10d45fee99042af88e21e1b4dc161a2 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 24 Jun 2016 16:14:16 +0300 Subject: update deps --- deps/com.juick.server | 2 +- src/main/java/com/juick/jabber/ws/Main.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deps/com.juick.server b/deps/com.juick.server index 1ce6bc55..c1fcf803 160000 --- a/deps/com.juick.server +++ b/deps/com.juick.server @@ -1 +1 @@ -Subproject commit 1ce6bc55817129159b1cda5076d039e9c3bc8508 +Subproject commit c1fcf803adfe06a0a54b3e51c4fd2d67e6b732d8 diff --git a/src/main/java/com/juick/jabber/ws/Main.java b/src/main/java/com/juick/jabber/ws/Main.java index 6f5ed96a..6a397fff 100644 --- a/src/main/java/com/juick/jabber/ws/Main.java +++ b/src/main/java/com/juick/jabber/ws/Main.java @@ -21,8 +21,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DriverManagerDataSource; import java.io.FileInputStream; -import java.util.ArrayList; -import java.util.Properties; +import java.util.*; import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; @@ -38,7 +37,7 @@ public class Main { JdbcTemplate sql; XMPPConnection xmpp; public static String STATSFILE = null; - public final static ArrayList clients = new ArrayList(); + public final static List clients = Collections.synchronizedList(new ArrayList()); public static void main(String[] args) { new Main().start(); -- cgit v1.2.3