fixup! 1.7.0-SNAPSHOT

Author: dmitriy.grytsovets

src/it/java/org/tarantool/TestTarantoolClient.java

@@ -53,6 +53,14 @@ public void run() {
             t.start();
         }
 
+
+        @Override
+        protected void configureThreads(String threadName) {
+            super.configureThreads(threadName);
+            reader.setDaemon(true);
+            writer.setDaemon(true);
+        }
+
         @Override
         protected void reconnect(int retry, Throwable lastError) {
             if (s != null) {

src/main/java/org/tarantool/TarantoolClientImpl.java

@@ -146,6 +146,14 @@ protected void connect(final SocketChannel channel) throws Exception {
         } finally {
             bufferLock.unlock();
         }
+
+        channel.configureBlocking(false);
+        this.channel = channel;
+
+        startThreads(channel.getRemoteAddress().toString());
+    }
+
+    protected void startThreads(String threadName) throws IOException, InterruptedException {
         final CountDownLatch init = new CountDownLatch(2);
         reader = new Thread(new Runnable() {
             @Override
@@ -162,18 +170,20 @@ public void run() {
             }
         });
 
-        channel.configureBlocking(false);
-        this.channel = channel;
 
-        reader.setName("Tarantool " + channel.getRemoteAddress().toString() + " reader");
-        writer.setName("Tarantool " + channel.getRemoteAddress().toString() + " writer");
-        writer.setPriority(config.writerThreadPriority);
-        reader.setPriority(config.readerThreadPriority);
+        configureThreads(threadName);
         reader.start();
         writer.start();
         init.await();
     }
 
+    protected void configureThreads(String threadName) {
+        reader.setName("Tarantool " + threadName + " reader");
+        writer.setName("Tarantool " + threadName + " writer");
+        writer.setPriority(config.writerThreadPriority);
+        reader.setPriority(config.readerThreadPriority);
+    }
+
 
     protected void auth(String username, final String password) throws Exception {
         final MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
@@ -324,7 +334,7 @@ protected void writeFully(SocketChannel channel, ByteBuffer buffer) throws IOExc
 
     protected void readThread() {
         try {
-            while (!Thread.interrupted()) {
+            while (!Thread.currentThread().isInterrupted()) {
                 try {
                     long code;
                     readPacket();
@@ -358,13 +368,13 @@ protected void readPacket() throws IOException {
 
     protected void writeThread() {
         writerBuffer.clear();
-        while (!Thread.interrupted()) {
+        while (!Thread.currentThread().isInterrupted()) {
             try {
                 bufferLock.lock();
-                if (sharedBuffer.position() == 0) {
-                    bufferNotEmpty.await();
-                }
                 try {
+                    while (sharedBuffer.position() == 0) {
+                        bufferNotEmpty.await();
+                    }
                     sharedBuffer.flip();
                     writerBuffer.put(sharedBuffer);
                     sharedBuffer.clear();