|
13 | 13 | import org.zeromq.SocketType; |
14 | 14 | import org.zeromq.ZMQ; |
15 | 15 | import org.zeromq.ZMQException; |
16 | | -import zmq.ZError; |
17 | 16 |
|
18 | 17 | /** TRex Transport class to create zmq socket for connection to trex server */ |
19 | 18 | public class TRexTransport { |
@@ -134,32 +133,17 @@ public synchronized String sendJson(String json) { |
134 | 133 | try { |
135 | 134 | zmqSocket.send(compressed); |
136 | 135 | } catch (ZMQException e) { |
137 | | - throwTimeoutException(e); |
| 136 | + throw new IllegalStateException( |
| 137 | + "Did not get any response from server " |
| 138 | + + getHost() |
| 139 | + + " within timeout " |
| 140 | + + zmqSocket.getReceiveTimeOut(), |
| 141 | + e); |
138 | 142 | } |
139 | 143 | byte[] msg = zmqSocket.recv(); |
140 | | - // add this if-block to deal with the connect lost error which is caused |
141 | | - // after a long time the client-server don't interactive |
142 | | - if (msg == null && zmqSocket.errno() == ZError.ENOTCONN) { |
143 | | - zmqSocket.connect(this.connectionString); |
144 | | - try { |
145 | | - zmqSocket.send(compressed); |
146 | | - } catch (ZMQException e) { |
147 | | - throwTimeoutException(e); |
148 | | - } |
149 | | - msg = zmqSocket.recv(); |
150 | | - } |
151 | 144 |
|
152 | 145 | String response = this.dataCompressor.decompressBytesToString(msg); |
153 | 146 | LOGGER.debug("JSON Resp: {}", response); |
154 | 147 | return response; |
155 | 148 | } |
156 | | - |
157 | | - private void throwTimeoutException(Exception e) { |
158 | | - throw new IllegalStateException( |
159 | | - "Did not get any response from server " |
160 | | - + getHost() |
161 | | - + " within timeout " |
162 | | - + zmqSocket.getReceiveTimeOut(), |
163 | | - e); |
164 | | - } |
165 | 149 | } |
0 commit comments