tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: TOMEE-1694 use tomcat destroy hook
Date Mon, 18 Jan 2016 21:01:58 GMT
Repository: tomee
Updated Branches:
  refs/heads/master fde16235f -> 1b960482e


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/1b960482
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1b960482
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1b960482

Branch: refs/heads/master
Commit: 1b960482eb84513f220c73cca5a1b86d1770b8d6
Parents: fde1623
Author: Romain Manni-Bucau <rmannibucau@gmail.com>
Authored: Mon Jan 18 22:01:49 2016 +0100
Committer: Romain Manni-Bucau <rmannibucau@gmail.com>
Committed: Mon Jan 18 22:01:49 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/tomee/catalina/JavaeeInstanceManager.java    | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/1b960482/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 27ab0ac..371390c 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
@@ -49,6 +49,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;


Mime
View raw message