Multi catch
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e3db1c18 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e3db1c18 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e3db1c18 Branch: refs/heads/tomee-1.7.x Commit: e3db1c18f52ac8d581381fbe040cd18c24999a4e Parents: 532ee1b Author: Jonathan Gallimore <[email protected]> Authored: Fri Mar 30 21:56:23 2018 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Fri Mar 30 21:56:23 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/tomee/catalina/JavaeeInstanceManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/e3db1c18/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 9efedec..e751d12 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 @@ -223,7 +223,11 @@ public class JavaeeInstanceManager implements InstanceManager { private static Object unwrapWebSocketPojo(final Object o) { try { return WEB_SOCKET_TYPES.getPojo == null ? o : WEB_SOCKET_TYPES.getPojo.invoke(o); - } catch (final IllegalAccessException | InvocationTargetException | NullPointerException e) { + } catch (final IllegalAccessException e) { + return o; + } catch (final InvocationTargetException e) { + return o; + } catch (final NullPointerException e) { return o; } }
