Skip to content

Commit 10c56d5

Browse files
committed
Fix for AsyncHttpClient#49 [websocket] API shoud be using the same name
1 parent 46e592e commit 10c56d5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@ public WebSocket sendPong(byte[] payload) {
25982598
}
25992599

26002600
@Override
2601-
public WebSocket addMessageListener(WebSocketListener l) {
2601+
public WebSocket addWebSocketListener(WebSocketListener l) {
26022602
gWebSocket.add(new AHCWebSocketListenerAdapter(l, this));
26032603
return this;
26042604
}

src/main/java/com/ning/http/client/providers/netty/NettyWebSocket.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public WebSocket sendPong(byte[] payload) {
7575
}
7676

7777
@Override
78-
public WebSocket addMessageListener(WebSocketListener l) {
78+
public WebSocket addWebSocketListener(WebSocketListener l) {
7979
listeners.add(l);
8080
return this;
8181
}

src/main/java/com/ning/http/client/websocket/WebSocket.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public interface WebSocket {
8585
* @param l a {@link WebSocketListener}
8686
* @return this
8787
*/
88-
WebSocket addMessageListener(WebSocketListener l);
88+
WebSocket addWebSocketListener(WebSocketListener l);
8989

9090
/**
9191
* Returns <code>true</code> if the WebSocket is open/connected.

src/main/java/com/ning/http/client/websocket/WebSocketUpgradeHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public final WebSocket onCompleted() throws Exception {
9494
public final void onSuccess(WebSocket webSocket) {
9595
this.webSocket = webSocket;
9696
for (WebSocketListener w : l) {
97-
webSocket.addMessageListener(w);
97+
webSocket.addWebSocketListener(w);
9898
w.onOpen(webSocket);
9999
}
100100
ok.set(true);
@@ -107,7 +107,7 @@ public final void onSuccess(WebSocket webSocket) {
107107
public final void onFailure(Throwable t) {
108108
for (WebSocketListener w : l) {
109109
if (!ok.get() && webSocket != null) {
110-
webSocket.addMessageListener(w);
110+
webSocket.addWebSocketListener(w);
111111
}
112112
w.onError(t);
113113
}

0 commit comments

Comments
 (0)