From d620a70eb807784576422ee3fa954631d9d1ee2b Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sun, 21 Jun 2015 12:35:25 +0100
Subject: [PATCH] Remove obsolete debug messages

---
 java/base/src/main/java/base/server/channel/TcpClient.java | 6 ++----
 .../src/main/java/base/server/channel/TcpServerClient.java | 5 +----
 .../main/java/base/server/datagram/UdpMulticastClient.java | 1 -
 .../main/java/base/server/datagram/UdpMulticastServer.java | 2 --
 java/base/src/main/java/base/worker/Worker.java            | 7 -------
 .../src/test/java/junit/TestUdpMulticastCommunication.java | 2 --
 6 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/java/base/src/main/java/base/server/channel/TcpClient.java b/java/base/src/main/java/base/server/channel/TcpClient.java
index 1c5465c..77ef722 100644
--- a/java/base/src/main/java/base/server/channel/TcpClient.java
+++ b/java/base/src/main/java/base/server/channel/TcpClient.java
@@ -82,10 +82,8 @@ public abstract class TcpClient extends Work implements Sender {
 
 	public final void work() {
 		try {
-			System.out.println("Client: Waiting for select... ");	
-			System.out.println("Client: Number of selected keys: " + selector.select());
-			System.out.println("wakker");
-			//selector.select();
+			logger.debug("Client: Waiting for select... ");	
+			logger.debug("Client: Number of selected keys: " + selector.select());
 			Set<SelectionKey> selectionKeySet = selector.selectedKeys();
 			Iterator<SelectionKey> selectionKeyIterator = selectionKeySet.iterator();
 
diff --git a/java/base/src/main/java/base/server/channel/TcpServerClient.java b/java/base/src/main/java/base/server/channel/TcpServerClient.java
index b9e7d97..f3cf4ec 100644
--- a/java/base/src/main/java/base/server/channel/TcpServerClient.java
+++ b/java/base/src/main/java/base/server/channel/TcpServerClient.java
@@ -34,12 +34,9 @@ public class TcpServerClient extends Listen<byte[]> implements Sender {
 	public void readable() throws IOException {
 		int read;		
 		while (( read = socketChannel.read(byteBuffer)) > 0) {
-			//byteBuffer.flip();
+			byteBuffer.flip();
 			byte[] buffer = byteBuffer.array();
 			input(buffer);
-			System.out.println("readable() " + new String(buffer).trim());
-			byteBuffer.clear();
-			byteBuffer.put(new byte[bufferSize]);
 			byteBuffer.clear();
 		}
 		if (read < 0) {
diff --git a/java/base/src/main/java/base/server/datagram/UdpMulticastClient.java b/java/base/src/main/java/base/server/datagram/UdpMulticastClient.java
index 37da5b1..bcec5d4 100644
--- a/java/base/src/main/java/base/server/datagram/UdpMulticastClient.java
+++ b/java/base/src/main/java/base/server/datagram/UdpMulticastClient.java
@@ -54,7 +54,6 @@ public abstract class UdpMulticastClient extends Work {
 	}
 
 	public void stop() {
-		System.out.println("client close socket");
 		socket.close();
 		super.stop();
 	}
diff --git a/java/base/src/main/java/base/server/datagram/UdpMulticastServer.java b/java/base/src/main/java/base/server/datagram/UdpMulticastServer.java
index 39cba2f..750c427 100644
--- a/java/base/src/main/java/base/server/datagram/UdpMulticastServer.java
+++ b/java/base/src/main/java/base/server/datagram/UdpMulticastServer.java
@@ -45,8 +45,6 @@ public class UdpMulticastServer extends Listen<byte[]> implements Sender {
 	}
 
 	public void deactivate() throws DeactivateException {
-		System.err.println("lets work the magic");
-
 		socket.close();
 		super.deactivate();
 	}
diff --git a/java/base/src/main/java/base/worker/Worker.java b/java/base/src/main/java/base/worker/Worker.java
index ad52e9b..a1e5c01 100644
--- a/java/base/src/main/java/base/worker/Worker.java
+++ b/java/base/src/main/java/base/worker/Worker.java
@@ -30,20 +30,15 @@ public abstract class Worker {
 
     public boolean active() {
     	logger.debug("Worker: active()");
-    	System.out.println(activate + " " + deactivate + " " + active + ": " + (deactivate || active));
         return deactivate || active;
     }
 
     public final void run() {
     	logger.debug("Worker: run()");
         while (run || deactivate) {
-        	System.err.println("xxx");
     		runActivate();
-    		System.err.println("act");
     		runDeactivate();
-    		System.err.println("deact");
     		runWork();
-    		System.err.println("---" + getClass().getName() + run + "  " + deactivate);
         }
     }
 
@@ -109,12 +104,10 @@ public abstract class Worker {
 
 	public void stop() {
 		logger.debug("Worker: stop()");
-		logger.debug("Worker: stop() " + active + " " + activate);
         if (active && !activate) {
             deactivate = true;
         }
         activate = false;
-        logger.debug("Worker: stop() " + deactivate);
 	}
 
     abstract public void exit();
diff --git a/java/base/src/test/java/junit/TestUdpMulticastCommunication.java b/java/base/src/test/java/junit/TestUdpMulticastCommunication.java
index fcee9e8..b9df364 100644
--- a/java/base/src/test/java/junit/TestUdpMulticastCommunication.java
+++ b/java/base/src/test/java/junit/TestUdpMulticastCommunication.java
@@ -41,7 +41,6 @@ public class TestUdpMulticastCommunication {
 		synchronized (client) {
 			client.wait(2000);
 		}
-		System.err.println("after wait");
 		byte[] buffer = client.buffer;
 		assertNotNull("Received input", buffer);
 		assertEquals("Message intact", message, new String(buffer).trim());
@@ -56,7 +55,6 @@ public class TestUdpMulticastCommunication {
 
 		protected void input(byte[] buffer) {
 			this.buffer = buffer;
-			System.err.println("binnen");
 			synchronized (this) {
 				notifyAll();
 			}