This is an automated email from the ASF dual-hosted git repository.
paulrutter pushed a change to branch
maintenance/FELIX-6746-websocketservlet-init-NPE
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
from ce69d42865 Merge branch 'master' into
maintenance/FELIX-6746-websocketservlet-init-NPE
add bb16933c80 FELIX-6746-websocketservlet-init-NPE - Move logic into
subclass
add 1035eade8b Merge branch
'maintenance/FELIX-6746-websocketservlet-init-NPE-subclass' into
maintenance/FELIX-6746-websocketservlet-init-NPE
No new revisions were added by this update.
Summary of changes:
.../handler/HttpServiceServletHandler.java | 2 +-
.../HttpServiceWebSocketServletHandler.java | 65 ++++++++++++++++
.../http/base/internal/handler/ServletHandler.java | 81 +++-----------------
.../base/internal/handler/WebSocketHandler.java | 87 ++++++++++++++++++++++
.../internal/handler/WhiteboardServletHandler.java | 2 +-
.../handler/WhiteboardWebSocketServletHandler.java | 81 ++++++++++++++++++++
.../internal/service/SharedHttpServiceImpl.java | 19 ++++-
.../http/base/internal/util/WebSocketUtil.java | 54 ++++++++++++++
.../internal/whiteboard/WhiteboardManager.java | 36 +++++++--
9 files changed, 346 insertions(+), 81 deletions(-)
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/HttpServiceWebSocketServletHandler.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/WebSocketHandler.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/handler/WhiteboardWebSocketServletHandler.java
create mode 100644
http/base/src/main/java/org/apache/felix/http/base/internal/util/WebSocketUtil.java
