✅ Fix test case to avoid too late adding listeners

xfeep · xfeep · commit e4cea135c773 · 2019-11-24T11:32:45.000+08:00
diff --git a/test/java/nginx/clojure/java/WebSocketTestSet4NginxJavaRingHandler.java b/test/java/nginx/clojure/java/WebSocketTestSet4NginxJavaRingHandler.java
@@ -191,10 +191,6 @@ public static class WSWholeTextHandler implements NginxJavaRingHandler {
 		public Object[] invoke(Map<String, Object> request) throws IOException {
 			NginxJavaRequest r = (NginxJavaRequest)request;
 			NginxHttpServerChannel sc = r.hijack(true);
-			//If we use nginx directive `auto_upgrade_ws on;`, these three lines can be omitted.
-			if (!sc.webSocketUpgrade(true)) {
-				return null;
-			}
 			sc.addListener(sc, new WholeMessageAdapter<NginxHttpServerChannel>(9*1024) {
 				/* (non-Javadoc)
 				 * @see nginx.clojure.WholeMessageAdapter#onWholeTextMessage(java.lang.Object, java.lang.String)
@@ -204,6 +200,12 @@ public void onWholeTextMessage(NginxHttpServerChannel ch, String message) throws
 					ch.send(message, true, false);
 				}
 			});
+			
+			//If we use nginx directive `auto_upgrade_ws on;`, these three lines can be omitted.
+			if (!sc.webSocketUpgrade(true)) {
+				return null;
+			}
+			
 			return null;
 		}
 	}
@@ -214,10 +216,7 @@ public static class WSWholeMessageHandler implements NginxJavaRingHandler {
 		public Object[] invoke(Map<String, Object> request) throws IOException {
 			NginxJavaRequest r = (NginxJavaRequest)request;
 			NginxHttpServerChannel sc = r.hijack(true);
-			//If we use nginx directive `auto_upgrade_ws on;`, these three lines can be omitted.
-			if (!sc.webSocketUpgrade(true)) {
-				return null;
-			}
+			
 			sc.addListener(sc, new WholeMessageAdapter<NginxHttpServerChannel>(64*1024) {
 				/* (non-Javadoc)
 				 * @see nginx.clojure.WholeMessageAdapter#onWholeTextMessage(java.lang.Object, java.lang.String)
@@ -235,6 +234,12 @@ public void onWholeBiniaryMessage(NginxHttpServerChannel ch, ByteBuffer message)
 					ch.send(message, true, false);
 				}
 			});
+			
+			//If we use nginx directive `auto_upgrade_ws on;`, these three lines can be omitted.
+			if (!sc.webSocketUpgrade(true)) {
+				return null;
+			}
+			
 			return null;
 		}
 	}
