Use multiple exceptions in one catch.

4 files changed, 4 insertions, 19 deletions

diff --git a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/EventManager.java b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/EventManager.java
index ffd4d88..0e96cae 100644
--- a/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/EventManager.java
+++ b/org.eclipse.gemini.web.core/src/main/java/org/eclipse/gemini/web/internal/EventManager.java
@@ -147,9 +147,7 @@ final class EventManager {
         try {
             getClass().getClassLoader().loadClass(EventAdmin.class.getName());
             return true;
-        } catch (NoClassDefFoundError ex) {
-            return false;
-        } catch (ClassNotFoundException ex) {
+        } catch (NoClassDefFoundError | ClassNotFoundException ex) {
             return false;
         }
     }
diff --git a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
index 3e06508..96ad922 100644
--- a/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
+++ b/org.eclipse.gemini.web.test/src/test/java/org/eclipse/gemini/web/test/tomcat/TomcatServletContainerTests.java
@@ -34,7 +34,6 @@ import java.net.MalformedURLException;
 import java.net.Socket;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.UnknownHostException;
 import java.util.Set;
 
 import javax.servlet.ServletContext;
@@ -119,8 +118,6 @@ public class TomcatServletContainerTests {
     public void testServletContainerAvailable() {
         assertNotNull(this.container);
         try (Socket socket = new Socket("localhost", 8080);) {
-        } catch (UnknownHostException e) {
-            fail("Unable to connect");
         } catch (IOException e) {
             fail("Unable to connect");
         }
diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/OsgiAwareEmbeddedTomcat.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/OsgiAwareEmbeddedTomcat.java
index b2c2471..de33233 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/OsgiAwareEmbeddedTomcat.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/OsgiAwareEmbeddedTomcat.java
@@ -436,15 +436,7 @@ public final class OsgiAwareEmbeddedTomcat extends org.apache.catalina.startup.T
                             try {
                                 Class<?> clazz = getClass().getClassLoader().loadClass(factory);
                                 return (ObjectFactory) clazz.newInstance();
-                            } catch (ClassNotFoundException e) {
-                                if (LOGGER.isInfoEnabled()) {
-                                    LOGGER.info("Error while trying to create object factory [" + factory + "]", e);
-                                }
-                            } catch (InstantiationException e) {
-                                if (LOGGER.isInfoEnabled()) {
-                                    LOGGER.info("Error while trying to create object factory [" + factory + "]", e);
-                                }
-                            } catch (IllegalAccessException e) {
+                            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
                                 if (LOGGER.isInfoEnabled()) {
                                     LOGGER.info("Error while trying to create object factory [" + factory + "]", e);
                                 }
diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
index 3dbca3e..1957731 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 VMware Inc.
+ * Copyright (c) 2009, 2014 VMware Inc.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -60,9 +60,7 @@ final class EquinoxBundleFileResolver implements BundleFileResolver {
         try {
             EquinoxBundleFileResolver.class.getClassLoader().loadClass(BundleHost.class.getName());
             return true;
-        } catch (Exception _) {
-            return false;
-        } catch (LinkageError _) {
+        } catch (Exception | LinkageError _) {
             return false;
         }
     }