disable heatbeat when heartbeat message is null

Deng · Deng · commit 23cffe1a8db7 · 2016-05-18T17:25:07.000+08:00
diff --git a/socketclient/src/main/java/com/vilyever/socketclient/SocketClient.java b/socketclient/src/main/java/com/vilyever/socketclient/SocketClient.java
@@ -334,9 +334,15 @@ public long getRemoteNoReplyAliveTimeout() {
      */
     private byte[] heartBeatMessage = SocketPacket.DefaultHeartBeatMessage;
     public SocketClient setHeartBeatMessage(String heartBeatMessage) {
+        return setHeartBeatMessageString(heartBeatMessage);
+    }
+    public SocketClient setHeartBeatMessageString(String heartBeatMessage) {
         return setHeartBeatMessage(heartBeatMessage, getCharsetName());
     }
     public SocketClient setHeartBeatMessage(String heartBeatMessage, String charsetName) {
+        return setHeartBeatMessageString(heartBeatMessage, charsetName);
+    }
+    public SocketClient setHeartBeatMessageString(String heartBeatMessage, String charsetName) {
         if (heartBeatMessage != null) {
             return setHeartBeatMessage(heartBeatMessage.getBytes(Charset.forName(charsetName)));
         }
@@ -346,6 +352,9 @@ public SocketClient setHeartBeatMessage(String heartBeatMessage, String charsetN
         }
     }
     public SocketClient setHeartBeatMessage(byte[] heartBeatMessage) {
+        return setHeartBeatMessageBytes(heartBeatMessage);
+    }
+    public SocketClient setHeartBeatMessageBytes(byte[] heartBeatMessage) {
         this.heartBeatMessage = heartBeatMessage;
         return this;
     }
diff --git a/socketclient/src/main/java/com/vilyever/socketclient/server/SocketServer.java b/socketclient/src/main/java/com/vilyever/socketclient/server/SocketServer.java
@@ -204,9 +204,15 @@ public String getCharsetName() {
      */
     private byte[] heartBeatMessage = SocketPacket.DefaultHeartBeatMessage;
     public SocketServer setHeartBeatMessage(String heartBeatMessage) {
+        return setHeartBeatMessageString(heartBeatMessage);
+    }
+    public SocketServer setHeartBeatMessageString(String heartBeatMessage) {
         return setHeartBeatMessage(heartBeatMessage, getCharsetName());
     }
     public SocketServer setHeartBeatMessage(String heartBeatMessage, String charsetName) {
+        return setHeartBeatMessageString(heartBeatMessage, charsetName);
+    }
+    public SocketServer setHeartBeatMessageString(String heartBeatMessage, String charsetName) {
         if (heartBeatMessage != null) {
             return setHeartBeatMessage(heartBeatMessage.getBytes(Charset.forName(charsetName)));
         }
@@ -216,6 +222,9 @@ public SocketServer setHeartBeatMessage(String heartBeatMessage, String charsetN
         }
     }
     public SocketServer setHeartBeatMessage(byte[] heartBeatMessage) {
+        return setHeartBeatMessageBytes(heartBeatMessage);
+    }
+    public SocketServer setHeartBeatMessageBytes(byte[] heartBeatMessage) {
         this.heartBeatMessage = heartBeatMessage;
         return this;
     }

Original file line number	Diff line number	Diff line change
`@@ -334,9 +334,15 @@ public long getRemoteNoReplyAliveTimeout() {`
`334`	`334`	`*/`
`335`	`335`	`private byte[] heartBeatMessage = SocketPacket.DefaultHeartBeatMessage;`
`336`	`336`	`public SocketClient setHeartBeatMessage(String heartBeatMessage) {`
	`337`	`+ return setHeartBeatMessageString(heartBeatMessage);`
	`338`	`+ }`
	`339`	`+ public SocketClient setHeartBeatMessageString(String heartBeatMessage) {`
`337`	`340`	`return setHeartBeatMessage(heartBeatMessage, getCharsetName());`
`338`	`341`	`}`
`339`	`342`	`public SocketClient setHeartBeatMessage(String heartBeatMessage, String charsetName) {`
	`343`	`+ return setHeartBeatMessageString(heartBeatMessage, charsetName);`
	`344`	`+ }`
	`345`	`+ public SocketClient setHeartBeatMessageString(String heartBeatMessage, String charsetName) {`
`340`	`346`	`if (heartBeatMessage != null) {`
`341`	`347`	`return setHeartBeatMessage(heartBeatMessage.getBytes(Charset.forName(charsetName)));`
`342`	`348`	`}`
`@@ -346,6 +352,9 @@ public SocketClient setHeartBeatMessage(String heartBeatMessage, String charsetN`
`346`	`352`	`}`
`347`	`353`	`}`
`348`	`354`	`public SocketClient setHeartBeatMessage(byte[] heartBeatMessage) {`
	`355`	`+ return setHeartBeatMessageBytes(heartBeatMessage);`
	`356`	`+ }`
	`357`	`+ public SocketClient setHeartBeatMessageBytes(byte[] heartBeatMessage) {`
`349`	`358`	`this.heartBeatMessage = heartBeatMessage;`
`350`	`359`	`return this;`
`351`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,15 @@ public String getCharsetName() {`
`204`	`204`	`*/`
`205`	`205`	`private byte[] heartBeatMessage = SocketPacket.DefaultHeartBeatMessage;`
`206`	`206`	`public SocketServer setHeartBeatMessage(String heartBeatMessage) {`
	`207`	`+ return setHeartBeatMessageString(heartBeatMessage);`
	`208`	`+ }`
	`209`	`+ public SocketServer setHeartBeatMessageString(String heartBeatMessage) {`
`207`	`210`	`return setHeartBeatMessage(heartBeatMessage, getCharsetName());`
`208`	`211`	`}`
`209`	`212`	`public SocketServer setHeartBeatMessage(String heartBeatMessage, String charsetName) {`
	`213`	`+ return setHeartBeatMessageString(heartBeatMessage, charsetName);`
	`214`	`+ }`
	`215`	`+ public SocketServer setHeartBeatMessageString(String heartBeatMessage, String charsetName) {`
`210`	`216`	`if (heartBeatMessage != null) {`
`211`	`217`	`return setHeartBeatMessage(heartBeatMessage.getBytes(Charset.forName(charsetName)));`
`212`	`218`	`}`
`@@ -216,6 +222,9 @@ public SocketServer setHeartBeatMessage(String heartBeatMessage, String charsetN`
`216`	`222`	`}`
`217`	`223`	`}`
`218`	`224`	`public SocketServer setHeartBeatMessage(byte[] heartBeatMessage) {`
	`225`	`+ return setHeartBeatMessageBytes(heartBeatMessage);`
	`226`	`+ }`
	`227`	`+ public SocketServer setHeartBeatMessageBytes(byte[] heartBeatMessage) {`
`219`	`228`	`this.heartBeatMessage = heartBeatMessage;`
`220`	`229`	`return this;`
`221`	`230`	`}`