aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Vallee <f.vallee@oberthur.com>2014-09-11 16:20:24 +0200
committerFlorian Vallee <f.vallee@oberthur.com>2014-09-12 13:27:51 +0200
commit52064191814fe744ae85e640cb869e122e4d61a3 (patch)
tree893691b48f6c6b5320015aeeec599e8a2554cf97
parente3eafe47c267e537e71053a3d9e01c3aa26528b7 (diff)
downloadAndroidAsync-52064191814fe744ae85e640cb869e122e4d61a3.tar.gz
AndroidAsync-52064191814fe744ae85e640cb869e122e4d61a3.tar.bz2
AndroidAsync-52064191814fe744ae85e640cb869e122e4d61a3.zip
Revert "Added protected API for WebSocket creation"
This reverts commit 4ee0ae0e6206f90a07f3a2269abc6c655a0289df.
-rw-r--r--AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
index 4259d1d..b1b393d 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServer.java
@@ -318,15 +318,11 @@ public class AsyncHttpServer {
response.end();
return;
}
- callback.onConnected(createWebSocket(request, response), request.getHeaders());
+ callback.onConnected(new WebSocketImpl(request, response), request.getHeaders());
}
});
}
- protected WebSocket createWebSocket(final AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {
- return new WebSocketImpl(request, response);
- }
-
public void get(String regex, HttpServerRequestCallback callback) {
addAction(AsyncHttpGet.METHOD, regex, callback);
}