Repository: tomee Updated Branches: refs/heads/tomee-1.7.x f4b052cc6 -> 4456ff806
TOMEE-1694 use tomcat destroy hook Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/dbb84791 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/dbb84791 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/dbb84791 Branch: refs/heads/tomee-1.7.x Commit: dbb84791b72485f410d388bbb9a46d4f3a72c58c Parents: f4b052c Author: Romain Manni-Bucau <[email protected]> Authored: Mon Jan 18 22:01:49 2016 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Mar 29 16:54:17 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/tomee/catalina/JavaeeInstanceManager.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/dbb84791/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java index 6318de8..3a8d6a7 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java @@ -43,6 +43,10 @@ public class JavaeeInstanceManager implements InstanceManager { @Override public Object newInstance(final Class<?> clazz) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException { try { + if ("org.apache.tomcat.websocket.server.WsHttpUpgradeHandler".equals(clazz.getName())) { + return clazz.newInstance(); + } + final Object object = webContext.newInstance(clazz); postConstruct(object, clazz); return object;
