Pass Issue666Test

Noah Andrews · Noah Andrews · commit 065e93e8e32b · 2019-04-09T14:03:16.000-04:00
diff --git a/src/main/java/org/java_websocket/AbstractWebSocket.java b/src/main/java/org/java_websocket/AbstractWebSocket.java
@@ -26,6 +26,7 @@
 package org.java_websocket;
 
 import org.java_websocket.framing.CloseFrame;
+import org.java_websocket.util.NamedThreadFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -170,7 +171,7 @@ protected void startConnectionLostTimer() {
 	 */
 	private void restartConnectionLostTimer() {
 		cancelConnectionLostTimer();
-		connectionLostCheckerService = Executors.newSingleThreadScheduledExecutor();
+		connectionLostCheckerService = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("connectionLostChecker"));
 		Runnable connectionLostChecker = new Runnable() {
 
 			/**
diff --git a/src/main/java/org/java_websocket/util/NamedThreadFactory.java b/src/main/java/org/java_websocket/util/NamedThreadFactory.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019 Noah Andrews
+ *
+ *  Permission is hereby granted, free of charge, to any person
+ *  obtaining a copy of this software and associated documentation
+ *  files (the "Software"), to deal in the Software without
+ *  restriction, including without limitation the rights to use,
+ *  copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following
+ *  conditions:
+ *
+ *  The above copyright notice and this permission notice shall be
+ *  included in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *  OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.java_websocket.util;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NamedThreadFactory implements ThreadFactory {
+        private final ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory();
+        private final AtomicInteger threadNumber = new AtomicInteger(1);
+        private final String threadPrefix;
+
+        public NamedThreadFactory(String threadPrefix) {
+            this.threadPrefix = threadPrefix;
+        }
+
+        @Override
+        public Thread newThread(Runnable runnable) {
+            Thread thread = defaultThreadFactory.newThread(runnable);
+            thread.setName(threadPrefix + "-" + threadNumber);
+            return thread;
+        }
+}
diff --git a/src/test/java/org/java_websocket/issues/Issue666Test.java b/src/test/java/org/java_websocket/issues/Issue666Test.java
@@ -80,7 +80,7 @@ public void onStart() {
 		}
 		for( Thread thread : mapAfter.values() ) {
 			String name = thread.getName();
-			if( !name.startsWith( "WebSocketSelector-" ) && !name.startsWith( "WebSocketWorker-" ) && !name.equals( "WebSocketTimer" ) ) {
+			if( !name.startsWith( "WebSocketSelector-" ) && !name.startsWith( "WebSocketWorker-" ) && !name.startsWith( "connectionLostChecker-" ) ) {
 				Assert.fail( "Thread not correctly named! Is: " + name );
 			}
 		}
@@ -145,7 +145,7 @@ public void onStart() {
 		}
 		for( Thread thread : mapAfter.values() ) {
 			String name = thread.getName();
-			if( !name.equals( "WebSocketTimer" ) && !name.startsWith( "WebSocketWriteThread-" ) && !name.startsWith( "WebSocketConnectReadThread-" )) {
+			if( !name.startsWith( "connectionLostChecker-" ) && !name.startsWith( "WebSocketWriteThread-" ) && !name.startsWith( "WebSocketConnectReadThread-" )) {
 				Assert.fail( "Thread not correctly named! Is: " + name );
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void onStart() {`
`80`	`80`	`}`
`81`	`81`	`for( Thread thread : mapAfter.values() ) {`
`82`	`82`	`String name = thread.getName();`
`83`		`- if( !name.startsWith( "WebSocketSelector-" ) && !name.startsWith( "WebSocketWorker-" ) && !name.equals( "WebSocketTimer" ) ) {`
	`83`	`+ if( !name.startsWith( "WebSocketSelector-" ) && !name.startsWith( "WebSocketWorker-" ) && !name.startsWith( "connectionLostChecker-" ) ) {`
`84`	`84`	`Assert.fail( "Thread not correctly named! Is: " + name );`
`85`	`85`	`}`
`86`	`86`	`}`
`@@ -145,7 +145,7 @@ public void onStart() {`
`145`	`145`	`}`
`146`	`146`	`for( Thread thread : mapAfter.values() ) {`
`147`	`147`	`String name = thread.getName();`
`148`		`- if( !name.equals( "WebSocketTimer" ) && !name.startsWith( "WebSocketWriteThread-" ) && !name.startsWith( "WebSocketConnectReadThread-" )) {`
	`148`	`+ if( !name.startsWith( "connectionLostChecker-" ) && !name.startsWith( "WebSocketWriteThread-" ) && !name.startsWith( "WebSocketConnectReadThread-" )) {`
`149`	`149`	`Assert.fail( "Thread not correctly named! Is: " + name );`
`150`	`150`	`}`
`151`	`151`	`}`