You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2017/04/05 12:39:52 UTC
cxf git commit: CXF-7276: Atmosphere init code should be moved out of
AtmosphereWebSocketServlet Destination (javadocs + cleanup)
Repository: cxf
Updated Branches:
refs/heads/master 9f82ccd9d -> 61a361610
CXF-7276: Atmosphere init code should be moved out of AtmosphereWebSocketServlet Destination (javadocs + cleanup)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/61a36161
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/61a36161
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/61a36161
Branch: refs/heads/master
Commit: 61a361610d57aaf18f2c574916621ac09af45151
Parents: 9f82ccd
Author: reta <dr...@gmail.com>
Authored: Wed Apr 5 08:39:43 2017 -0400
Committer: reta <dr...@gmail.com>
Committed: Wed Apr 5 08:39:43 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/transport/servlet/ServletConfigAware.java | 4 ++++
.../atmosphere/AtmosphereWebSocketServletDestination.java | 6 ------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/61a36161/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
index 07a5f62..59abc0c 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletConfigAware.java
@@ -21,6 +21,10 @@ package org.apache.cxf.transport.servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
+/**
+ * Interface to be implemented by any Destination that wishes to be notified of the
+ * SerlvetConfig availability.
+ */
public interface ServletConfigAware {
default void onServletConfigAvailable(ServletConfig config) throws ServletException {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/61a36161/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
index e7c7551..f1c0cd6 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketServletDestination.java
@@ -103,12 +103,6 @@ public class AtmosphereWebSocketServletDestination extends ServletDestination im
HttpServletResponse resp) throws IOException {
if (AtmosphereUtils.useAtmosphere(req)) {
try {
-// if (!framework.initialized()) {
-// framework.addInitParameter(ApplicationConfig.PROPERTY_NATIVE_COMETSUPPORT, "false");
-// framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPRESS_JSR356, "false");
-// framework.init(config);
-// }
-
framework.doCometSupport(AtmosphereRequestImpl.wrap(req),
AtmosphereResponseImpl.wrap(resp));
} catch (ServletException e) {