also accept \nOK\r\n as response from signal light

jambit · Jul 14, 2012 · efd01fb · efd01fb
1 parent f22f8bb
commit efd01fb
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/signallight/src/main/java/com/jambit/jambel/light/cmdctrl/lan/LanCommandSender.java b/signallight/src/main/java/com/jambit/jambel/light/cmdctrl/lan/LanCommandSender.java
@@ -50,14 +50,18 @@ public String send(String command) {
 
 			// command
 			Writer writer = new OutputStreamWriter(connection.getOutputStream(), Charsets.US_ASCII);
-			PrintWriter printer = new PrintWriter(writer, true);
-			printer.println(command);
+			writer.write(command + "\r\n");
+			writer.flush();
 
 			// response
 			Reader reader = new InputStreamReader(connection.getInputStream(), Charsets.US_ASCII);
 			BufferedReader bufferedReader = new BufferedReader(reader);
 			String response = bufferedReader.readLine();
 
+			// sometimes, the signal light returns "\nOK\r\n => read another line
+			if(response.isEmpty())
+				response = bufferedReader.readLine();
+
 			logger.debug("sent command '{}' and received response '{}' to signal light at {}", new Object[]{command, response, hostAndPort});
 
 			// close