#78 Revert from read_nonblock back to recv_nonblock. Fix minor bug in…

… template_stream_protocol.
BallAerospace · Mar 12, 2015 · 4d1cbe1 · 4d1cbe1
1 parent c523da8
commit 4d1cbe1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/cosmos/io/json_drb.rb b/lib/cosmos/io/json_drb.rb
@@ -194,7 +194,7 @@ def self.receive_message(socket, data)
     def self.get_at_least_x_bytes_of_data(socket, current_data, required_num_bytes)
       while (current_data.length < required_num_bytes)
         begin
-          data = socket.read_nonblock(65535)
+          data = socket.recv_nonblock(65535)
           if data.length == 0
             current_data.replace('')
             return

diff --git a/lib/cosmos/streams/tcpip_socket_stream.rb b/lib/cosmos/streams/tcpip_socket_stream.rb
@@ -49,7 +49,7 @@ def read
       # No read mutex is needed because there is only one stream procesor
       # reading
       begin
-        data = @read_socket.read_nonblock(65535)
+        data = @read_socket.recv_nonblock(65535)
         @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
       rescue IO::WaitReadable
         # Wait for the socket to be ready for reading or for the timeout
@@ -79,7 +79,7 @@ def read_nonblock
       # No read mutex is needed because there is only one stream procesor
       # reading
       begin
-        data = @read_socket.read_nonblock(65535)
+        data = @read_socket.recv_nonblock(65535)
         @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
       rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::ECONNRESET, Errno::ECONNABORTED
         data = ''

diff --git a/lib/cosmos/streams/template_stream_protocol.rb b/lib/cosmos/streams/template_stream_protocol.rb
@@ -126,7 +126,7 @@ def post_write_data(packet, data)
         # Scan the response for the variables in brackets <VARIABLE>
         # Write the packet value with each of the values received
         response_values = response_string.scan(response_regexp)[0]
-        raise "Unexpected response received: #{response_string}" if response_values.length != response_item_names.length
+        raise "Unexpected response received: #{response_string}" if !response_values or (response_values.length != response_item_names.length)
         response_values.each_with_index do |value, i|
           result_packet.write(response_item_names[i], value)
         end