diff --git a/src/main/java/ru/molokoin/ExchangeServer.java b/src/main/java/ru/molokoin/ExchangeServer.java index 84a6a55..9f0a8ff 100644 --- a/src/main/java/ru/molokoin/ExchangeServer.java +++ b/src/main/java/ru/molokoin/ExchangeServer.java @@ -1,8 +1,11 @@ package ru.molokoin; +import java.util.Queue; +import java.util.concurrent.ArrayBlockingQueue; + public class ExchangeServer { - private static ServerLauncher launch = new ServerLauncher(); - public static Thread server = new Thread(launch); + private static ServerLauncher launch; + public static Thread server; //Запуск сервера public void enable(ExchangeServer server){ @@ -13,6 +16,10 @@ public class ExchangeServer { // } public static void main(String[] args) { + Queue connectionQueue = (Queue)new ArrayBlockingQueue(1024); + launch = new ServerLauncher(8081, connectionQueue); + server = new Thread(launch); + server.setName("ServerLauncherThread"); server.start(); } diff --git a/src/main/java/ru/molokoin/ServerLauncher.java b/src/main/java/ru/molokoin/ServerLauncher.java index cd4d9f0..b894bb8 100644 --- a/src/main/java/ru/molokoin/ServerLauncher.java +++ b/src/main/java/ru/molokoin/ServerLauncher.java @@ -16,6 +16,11 @@ public class ServerLauncher implements Runnable{ private Queue connectionQueue = null; private boolean isActive = false;//флаг проверки, запущен ли сервер + ServerLauncher(int port, Queue connectionQueue){ + tcpPort = port; + this.connectionQueue = connectionQueue; + } + @Override public void run() { try{ diff --git a/target/classes/ru/molokoin/ExchangeServer.class b/target/classes/ru/molokoin/ExchangeServer.class index 7479344..7e06e5d 100644 Binary files a/target/classes/ru/molokoin/ExchangeServer.class and b/target/classes/ru/molokoin/ExchangeServer.class differ diff --git a/target/classes/ru/molokoin/ServerLauncher.class b/target/classes/ru/molokoin/ServerLauncher.class index db3190a..f4c8e61 100644 Binary files a/target/classes/ru/molokoin/ServerLauncher.class and b/target/classes/ru/molokoin/ServerLauncher.class differ