commit | 4eaaff59f6ff53bd6a4adbe0127b7127cbbdd7d4 | [log] [tgz] |
---|---|---|
author | Murtadha Hubail <mhubail@apache.org> | Thu May 09 15:18:21 2019 +0300 |
committer | Murtadha Hubail <mhubail@apache.org> | Thu May 09 18:10:04 2019 +0000 |
tree | 760ac02fc212625957855bd83404678a784a9719 | |
parent | a93a5c6fe4f83cef973f5caaa540723c96e29ba2 [diff] |
[NO ISSUE][OTH] Ensure HttpServer Channel is Initialized - user model changes: no - storage format changes: no - interface changes: no Details: - Ensure the HttpServer channel is initialized when stopping the server to avoid NPE. Change-Id: I5b7403e80f6118f99be46d166c6cfbee8d4305ac Reviewed-on: https://asterix-gerrit.ics.uci.edu/3389 Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Dmitry Lychagin <dmitry.lychagin@couchbase.com>
diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java index 152f6c7..d9902da 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
@@ -333,8 +333,10 @@ } catch (Exception e) { LOGGER.log(Level.ERROR, "Error while shutting down http server executor", e); } - channel.close(); - channel.closeFuture().sync(); + if (channel != null) { + channel.close(); + channel.closeFuture().sync(); + } } public IServlet getServlet(FullHttpRequest request) {