Merge branch 'master' of http://git.jiayuepowertech.com:9022/xiuwei/protocol

protocol-core/src/main/java/wei/yigulu/netty/AbstractTcpMasterBuilder.java

@@ -73,11 +73,11 @@ public abstract class AbstractTcpMasterBuilder extends AbstractMasterBuilder {
 				this.future.removeListener(getOrCreateConnectionListener());
 				this.future.addListener(ChannelFutureListener.CLOSE);
 				future = null;
-			}
-			try {
-				Thread.sleep(5000L);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
+				try {
+					Thread.sleep(5000L);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
 			}
 			log.debug("创建连接");
 			try {

protocol-modbus/src/test/java/TestTcpCommandMaster.java

@@ -21,7 +21,7 @@ public class TestTcpCommandMaster {
 		ModbusTcpMasterBuilder master = new ModbusTcpMasterBuilder("127.0.0.1", 5002);
 		master.createByUnBlock();
 		TcpSynchronousWaitingRoom.waitTime = 5000L;
-		Thread.sleep(3000L);
+		Thread.sleep(5000L);
 		Random random = new Random();
 		BigDecimal val;
 		BigDecimal val1;