You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/08/28 20:12:27 UTC
svn commit: r1621173 [1/2] - in /tomee/tomee/trunk:
arquillian/ziplock/src/main/java/org/apache/ziplock/
container/openejb-core/src/main/java/org/apache/openejb/
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/opene...
Author: tveronezi
Date: Thu Aug 28 18:12:25 2014
New Revision: 1621173
URL: http://svn.apache.org/r1621173
Log:
collapsing identical catch blocks
Modified:
tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java
tomee/tomee/trunk/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java
tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java
tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastConnectionFactory.java
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ServiceLocator.java
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java
tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java
tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java
tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/valve/MinimumErrorReportValve.java
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java
tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProviderFactory.java
tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java
tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java
Modified: tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java (original)
+++ tomee/tomee/trunk/arquillian/ziplock/src/main/java/org/apache/ziplock/ResourceFinder.java Thu Aug 28 18:12:25 2014
@@ -1062,12 +1062,8 @@ public class ResourceFinder {
return resourceURL;
}
}
- } catch (final MalformedURLException e) {
+ } catch (final SecurityException | IOException e) {
// Keep iterating through the URL list
- } catch (final IOException e) {
- // no-op
- } catch (final SecurityException e) {
- // no-op
}
}
return null;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java Thu Aug 28 18:12:25 2014
@@ -460,10 +460,8 @@ public class ClassLoaderUtil {
} else {
logger.error("Unable to clear Sun JarFileFactory cache after 5 attempts", e);
}
- } catch (final ClassNotFoundException e) {
+ } catch (final ClassNotFoundException | NoSuchFieldException e) {
// not a sun vm
- } catch (final NoSuchFieldException e) {
- // different version of sun vm?
} catch (final Throwable e) {
logger.error("Unable to clear Sun JarFileFactory cache", e);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Thu Aug 28 18:12:25 2014
@@ -353,11 +353,7 @@ public final class OpenEjbContainer exte
}
return openEjbContainer;
- } catch (final OpenEJBException e) {
-
- throw new EJBException(e);
-
- } catch (final MalformedURLException e) {
+ } catch (final OpenEJBException | MalformedURLException e) {
throw new EJBException(e);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Aug 28 18:12:25 2014
@@ -327,8 +327,6 @@ public class Assembler extends Assembler
final Collection<URL> urls = NewLoaderLogic.applyBuiltinExcludes(new UrlSet(Assembler.class.getClassLoader()).excludeJvm()).getUrls();
Extensions.installExtensions(new ResourceFinder("META-INF", urls.toArray(new URL[urls.size()])));
return;
- } catch (final MalformedURLException e) {
- // no-op
} catch (final IOException e) {
// no-op
}
@@ -2099,9 +2097,7 @@ public class Assembler extends Assembler
try {
LocalMBeanServer.get().registerMBean(new DynamicMBeanWrapper(new JMXContainer(serviceInfo, (Container) service)), objectName);
containerObjectNames.add(objectName);
- } catch (final Exception e) {
- // no-op
- } catch (final NoClassDefFoundError ncdfe) { // OSGi
+ } catch (final Exception | NoClassDefFoundError e) {
// no-op
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Thu Aug 28 18:12:25 2014
@@ -619,9 +619,7 @@ public class JndiEncBuilder {
try {
final Class<?> target = classLoader.loadClass(injection.className.trim());
return IntrospectionSupport.getPropertyType(target, injection.propertyName.trim());
- } catch (final ClassNotFoundException e) {
- // ignore
- } catch (final NoSuchFieldException e) {
+ } catch (final ClassNotFoundException | NoSuchFieldException e) {
// ignore
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java Thu Aug 28 18:12:25 2014
@@ -482,9 +482,7 @@ public final class ValidatorBuilder {
injectionTarget.preDestroy(instance);
injectionTarget.dispose(instance);
context.release();
- } catch (final Exception e) {
- // no-op
- } catch (final NoClassDefFoundError e) {
+ } catch (final Exception | NoClassDefFoundError e) {
// no-op
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Thu Aug 28 18:12:25 2014
@@ -1243,9 +1243,7 @@ public class AutoConfig implements Dynam
final Class target = classLoader.loadClass(injection.getInjectionTargetClass().trim());
final Class type = IntrospectionSupport.getPropertyType(target, injection.getInjectionTargetName().trim());
return type.getName();
- } catch (final ClassNotFoundException e) {
- // ignore
- } catch (final NoSuchFieldException e) {
+ } catch (final ClassNotFoundException | NoSuchFieldException e) {
// ignore
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java Thu Aug 28 18:12:25 2014
@@ -64,8 +64,6 @@ public class ConfigUtils {
if (file != null && file.exists() && file.isFile()) {
return file.getAbsolutePath();
}
- } catch (final FileNotFoundException ignored) {
- // no-op
} catch (final IOException ignored) {
// no-op
}
@@ -78,8 +76,6 @@ public class ConfigUtils {
if (file != null && file.exists() && file.isFile()) {
return file.getAbsolutePath();
}
- } catch (final FileNotFoundException ignored) {
- // no-op
} catch (final IOException ignored) {
// no-op
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Aug 28 18:12:25 2014
@@ -958,10 +958,8 @@ public class ConfigurationFactory implem
notLoaded.addAll(finder.getResourcesNotLoaded());
}
}
- } catch (final IllegalArgumentException iae) {
+ } catch (final IllegalArgumentException | MalformedURLException iae) {
logger.debug("can't look for server event listener for module " + ejb.getModuleUri(), iae);
- } catch (final MalformedURLException mue) {
- logger.debug("can't look for server event listener for module " + ejb.getModuleUri(), mue);
} catch (final Exception e) {
logger.error("can't look for server event listener for module " + ejb.getJarLocation());
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Thu Aug 28 18:12:25 2014
@@ -661,10 +661,7 @@ public class DeploymentLoader implements
try {
detectAndAddModuleToApplication(appId, tmpClassLoader, ejbModules, clientModules, resouceModules, webModules, entry);
- } catch (final UnsupportedOperationException e) {
- // Ignore it as per the javaee spec EE.8.4.2 section 1.d.iii
- logger.info("Ignoring unknown module type: " + entry.getKey());
- } catch (final UnknownModuleTypeException e) {
+ } catch (final UnsupportedOperationException | UnknownModuleTypeException e) {
// Ignore it as per the javaee spec EE.8.4.2 section 1.d.iii
logger.info("Ignoring unknown module type: " + entry.getKey());
} catch (final Exception e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java Thu Aug 28 18:12:25 2014
@@ -56,9 +56,7 @@ public class MBeanDeployer implements Dy
try { // for OSGi environment, javax.management is imported by the JRE
mbeanClasses.add((Class<? extends Annotation>) cl.loadClass("javax.management.MBean"));
- } catch (final NoClassDefFoundError noClassDefFoundError) {
- // ignored
- } catch (final ClassNotFoundException e) {
+ } catch (final NoClassDefFoundError | ClassNotFoundException noClassDefFoundError) {
// ignored
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Thu Aug 28 18:12:25 2014
@@ -741,9 +741,7 @@ public class ReadDescriptors implements
try {
final Connector10 connector10 = (Connector10) JaxbJavaee.unmarshalJavaee(Connector10.class, IO.read(url));
connector = Connector.newConnector(connector10);
- } catch (final ParserConfigurationException e1) {
- throw new OpenEJBException("Cannot parse the ra.xml file: " + url.toExternalForm(), e);
- } catch (final SAXException e1) {
+ } catch (final ParserConfigurationException | SAXException e1) {
throw new OpenEJBException("Cannot parse the ra.xml file: " + url.toExternalForm(), e);
} catch (final JAXBException e1) {
throw new OpenEJBException("Cannot unmarshall the ra.xml file: " + url.toExternalForm(), e);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ServiceUtils.java Thu Aug 28 18:12:25 2014
@@ -104,10 +104,8 @@ public class ServiceUtils {
return true;
}
}
- } catch (final OpenEJBException ignored) {
+ } catch (final OpenEJBException | IllegalStateException ignored) {
// someone else will load the file and get the exception
- } catch (final IllegalStateException ise) {
- // can happen if nothing is found, same
}
return false;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClasses.java Thu Aug 28 18:12:25 2014
@@ -241,16 +241,7 @@ public class CheckClasses extends Valida
klass.toString();
}
}
- } catch (final ClassNotFoundException e) {
- /*
- # 0 - Referring Class name
- # 1 - Dependent Class name
- # 2 - Element (home, ejb-class, remote)
- # 3 - Bean name
- */
- final String missingClass = e.getMessage();
- fail(b, "missing.dependent.class", className, missingClass, type, b.getEjbName());
- } catch (final NoClassDefFoundError e) {
+ } catch (final ClassNotFoundException | NoClassDefFoundError e) {
/*
# 0 - Referring Class name
# 1 - Dependent Class name
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxAppCtxConfig.java Thu Aug 28 18:12:25 2014
@@ -131,9 +131,7 @@ public class SaxAppCtxConfig {
if (file.exists()) {
try {
parse(module, new InputSource(new FileInputStream(file)), envEntriesDeployer, beanPropertiesDeployer);
- } catch (final ParserConfigurationException e) {
- throw new SAXException(e);
- } catch (final IOException e) {
+ } catch (final ParserConfigurationException | IOException e) {
throw new SAXException(e);
}
} else { // try in the classpath
@@ -143,9 +141,7 @@ public class SaxAppCtxConfig {
if (is != null) {
try {
parse(module, new InputSource(is), envEntriesDeployer, beanPropertiesDeployer);
- } catch (final ParserConfigurationException e) {
- throw new SAXException(e);
- } catch (final IOException e) {
+ } catch (final ParserConfigurationException | IOException e) {
throw new SAXException(e);
}
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java Thu Aug 28 18:12:25 2014
@@ -272,9 +272,7 @@ class SaxOpenejb extends StackHandler {
try {
final Openejb importedOpenEJB = parse(new InputSource(is));
merge(openejb, importedOpenEJB);
- } catch (final ParserConfigurationException e) {
- throw new SAXException(e);
- } catch (final IOException e) {
+ } catch (final ParserConfigurationException | IOException e) {
throw new SAXException(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java Thu Aug 28 18:12:25 2014
@@ -252,9 +252,7 @@ public abstract class BaseContext implem
try {
jndiEnc = (Context) jndiEnc.lookup("comp/env");
return jndiEnc.lookup(name);
- } catch (final NamingException e) {
- throw new IllegalArgumentException(e);
- } catch (final RuntimeException e) {
+ } catch (final NamingException | RuntimeException e) {
throw new IllegalArgumentException(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Thu Aug 28 18:12:25 2014
@@ -139,9 +139,7 @@ public class TempClassLoader extends URL
if (c != null) {
return c;
}
- } catch (final ClassNotFoundException ignored) {
- // no-op
- } catch (final NoClassDefFoundError ignored) {
+ } catch (final ClassNotFoundException | NoClassDefFoundError ignored) {
// no-op
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/WebContext.java Thu Aug 28 18:12:25 2014
@@ -128,9 +128,7 @@ public class WebContext {
creationalContext = null;
try {
o = beanClass.newInstance();
- } catch (final InstantiationException e) {
- throw new OpenEJBException(e);
- } catch (final IllegalAccessException e) {
+ } catch (final InstantiationException | IllegalAccessException e) {
throw new OpenEJBException(e);
}
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java Thu Aug 28 18:12:25 2014
@@ -207,9 +207,7 @@ public abstract class BaseEjbProxyHandle
if (clazz.isInterface() && getBeanContext().getInterfaceType(clazz) == InterfaceType.BUSINESS_REMOTE) {
try {
list.add(contextClassLoader.loadClass(clazz.getName()));
- } catch (final ClassNotFoundException e) {
- list.add(clazz);
- } catch (final NoClassDefFoundError e) {
+ } catch (final ClassNotFoundException | NoClassDefFoundError e) {
list.add(clazz);
}
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/InitContextFactory.java Thu Aug 28 18:12:25 2014
@@ -90,8 +90,6 @@ public class InitContextFactory implemen
OpenEJB.init(props);
- } catch (final OpenEJBException e) {
- throw new NamingException("Cannot initailize OpenEJB", e);
} catch (final Exception e) {
throw new NamingException("Cannot initailize OpenEJB", e);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java Thu Aug 28 18:12:25 2014
@@ -372,10 +372,7 @@ public class MdbContainer implements Rpc
// invoke the target method
returnValue = _invoke(instance, targetMethod, args, deployInfo, type, mdbCallContext);
return returnValue;
- } catch (final ApplicationException e) {
- openEjbException = e;
- throw e;
- } catch (final SystemException e) {
+ } catch (final ApplicationException | SystemException e) {
openEjbException = e;
throw e;
} finally {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/SQLLoginModule.java Thu Aug 28 18:12:25 2014
@@ -191,10 +191,8 @@ public class SQLLoginModule implements L
try {
handler.handle(callbacks);
- } catch (final IOException ioe) {
+ } catch (final IOException | UnsupportedCallbackException ioe) {
throw (LoginException) new LoginException().initCause(ioe);
- } catch (final UnsupportedCallbackException uce) {
- throw (LoginException) new LoginException().initCause(uce);
}
assert callbacks.length == 2;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java Thu Aug 28 18:12:25 2014
@@ -244,10 +244,7 @@ public class StatelessContainer implemen
} finally {
try {
afterInvoke(txPolicy, callContext);
- } catch (final SystemException e) {
- callContext.setDiscardInstance(true);
- throw e;
- } catch (final RuntimeException e) {
+ } catch (final SystemException | RuntimeException e) {
callContext.setDiscardInstance(true);
throw e;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicy.java Thu Aug 28 18:12:25 2014
@@ -374,15 +374,11 @@ public abstract class JtaTransactionPoli
} else {
tx.rollback();
}
- } catch (final IllegalStateException e) {
+ } catch (final IllegalStateException | javax.transaction.SystemException e) {
logger.error("The TransactionManager reported an exception while attempting to rollback the transaction: " + e.getMessage());
throw new SystemException(e);
- } catch (final javax.transaction.SystemException e) {
-
- logger.error("The TransactionManager reported an exception while attempting to rollback the transaction: " + e.getMessage());
- throw new SystemException(e);
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java Thu Aug 28 18:12:25 2014
@@ -73,13 +73,8 @@ public class WsdlResolver implements WSD
}
importedUri = importUrl.toURI().toString();
- } catch (final MalformedURLException e) {
- //
- } catch (final URISyntaxException e) {
- //
- } catch (final IOException e) {
- //
-
+ } catch (final URISyntaxException | IOException e) {
+ // no-op
}
return inputSource;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/DynamicMBeanWrapper.java Thu Aug 28 18:12:25 2014
@@ -75,9 +75,7 @@ public class DynamicMBeanWrapper impleme
OPENEJB_API_TO_JAVAX.put(ManagedAttribute.class, (Class<? extends Annotation>) loader.loadClass("javax.management.ManagedAttribute"));
OPENEJB_API_TO_JAVAX.put(NotificationInfo.class, (Class<? extends Annotation>) loader.loadClass("javax.management.NotificationInfo"));
OPENEJB_API_TO_JAVAX.put(NotificationInfos.class, (Class<? extends Annotation>) loader.loadClass("javax.management.NotificationInfos"));
- } catch (final ClassNotFoundException cnfe) {
- // ignored
- } catch (final NoClassDefFoundError ncdfe) {
+ } catch (final ClassNotFoundException | NoClassDefFoundError cnfe) {
// ignored
}
}
@@ -347,11 +345,7 @@ public class DynamicMBeanWrapper impleme
Thread.currentThread().setContextClassLoader(classloader);
try {
return getters.get(attribute).invoke(instance);
- } catch (final IllegalArgumentException e) {
- logger.error("can't get " + attribute + " value", e);
- } catch (final IllegalAccessException e) {
- logger.error("can't get " + attribute + " value", e);
- } catch (final InvocationTargetException e) {
+ } catch (final IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
logger.error("can't get " + attribute + " value", e);
} finally {
Thread.currentThread().setContextClassLoader(oldCl);
@@ -369,11 +363,7 @@ public class DynamicMBeanWrapper impleme
Thread.currentThread().setContextClassLoader(classloader);
try {
setters.get(attribute.getName()).invoke(instance, attribute.getValue());
- } catch (final IllegalArgumentException e) {
- logger.error("can't set " + attribute + " value", e);
- } catch (final IllegalAccessException e) {
- logger.error("can't set " + attribute + " value", e);
- } catch (final InvocationTargetException e) {
+ } catch (final IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
logger.error("can't set " + attribute + " value", e);
} finally {
Thread.currentThread().setContextClassLoader(oldCl);
@@ -419,11 +409,7 @@ public class DynamicMBeanWrapper impleme
Thread.currentThread().setContextClassLoader(classloader);
try {
return operations.get(actionName).invoke(instance, params);
- } catch (final IllegalArgumentException e) {
- logger.error(actionName + "can't be invoked", e);
- } catch (final IllegalAccessException e) {
- logger.error(actionName + "can't be invoked", e);
- } catch (final InvocationTargetException e) {
+ } catch (final IllegalArgumentException | InvocationTargetException | IllegalAccessException e) {
logger.error(actionName + "can't be invoked", e);
} finally {
Thread.currentThread().setContextClassLoader(oldCl);
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/monitoring/ManagedMBean.java Thu Aug 28 18:12:25 2014
@@ -151,9 +151,7 @@ public class ManagedMBean implements Dyn
s = member.getName();
}
scan(member.get(), s);
- } catch (final IllegalAccessException e) {
- e.printStackTrace();
- } catch (final InvocationTargetException e) {
+ } catch (final IllegalAccessException | InvocationTargetException e) {
e.printStackTrace();
}
} else {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/GeronimoConnectionManagerFactory.java Thu Aug 28 18:12:25 2014
@@ -394,9 +394,7 @@ public class GeronimoConnectionManagerFa
if (current instanceof AbstractSinglePoolConnectionInterceptor) {
try {
foundLock = (ReadWriteLock) AbstractSinglePoolConnectionInterceptor.class.getField("resizeLock").get(current);
- } catch (final IllegalAccessException e) {
- // no-op
- } catch (final NoSuchFieldException e) {
+ } catch (final IllegalAccessException | NoSuchFieldException e) {
// no-op
}
break;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicDataSource.java Thu Aug 28 18:12:25 2014
@@ -83,9 +83,7 @@ public class BasicDataSource extends org
private void registerAsMbean(final String name) {
try {
jmxDs = new JMXBasicDataSource(name, this);
- } catch (final Exception e) {
- jmxDs = null;
- } catch (final NoClassDefFoundError ncdfe) { // OSGi
+ } catch (final Exception | NoClassDefFoundError e) {
jmxDs = null;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/BasicManagedDataSource.java Thu Aug 28 18:12:25 2014
@@ -63,9 +63,7 @@ public class BasicManagedDataSource exte
try {
try {
Thread.currentThread().getContextClassLoader().loadClass(xaDataSource);
- } catch (final ClassNotFoundException cnfe) {
- setJndiXaDataSource(xaDataSource);
- } catch (final NoClassDefFoundError ncdfe) {
+ } catch (final ClassNotFoundException | NoClassDefFoundError cnfe) {
setJndiXaDataSource(xaDataSource);
}
} catch (final Throwable th) {
@@ -87,9 +85,7 @@ public class BasicManagedDataSource exte
private void registerAsMbean(final String name) {
try {
jmxDs = new JMXBasicDataSource(name, this);
- } catch (final Exception e) {
- jmxDs = null;
- } catch (final NoClassDefFoundError ncdfe) { // OSGi
+ } catch (final Exception | NoClassDefFoundError e) {
jmxDs = null;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java Thu Aug 28 18:12:25 2014
@@ -71,9 +71,7 @@ public class LocalBeanProxyFactory imple
} finally {
field.setAccessible(false);
}
- } catch (final NoSuchFieldException e) {
- throw new IllegalArgumentException(e);
- } catch (final IllegalAccessException e) {
+ } catch (final NoSuchFieldException | IllegalAccessException e) {
throw new IllegalArgumentException(e);
}
}
@@ -87,9 +85,7 @@ public class LocalBeanProxyFactory imple
} finally {
field.setAccessible(false);
}
- } catch (final NoSuchFieldException e) {
- throw new IllegalArgumentException(e);
- } catch (final IllegalAccessException e) {
+ } catch (final NoSuchFieldException | IllegalAccessException e) {
throw new IllegalArgumentException(e);
}
}
Modified: tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java (original)
+++ tomee/tomee/trunk/container/openejb-javaagent/src/main/java/org/apache/openejb/javaagent/Agent.java Thu Aug 28 18:12:25 2014
@@ -150,9 +150,7 @@ public class Agent {
// The AgentJar is loaded into the system classpath, and this class could
// be in a child classloader, so we need to double check the system classpath
checkSystemClassPath();
- } catch (final ClassNotFoundException e) {
- // not a Sun VM
- } catch (final NoSuchMethodException e) {
+ } catch (final ClassNotFoundException | NoSuchMethodException e) {
// not a Sun VM
}
}
Modified: tomee/tomee/trunk/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-client/src/main/java/jug/client/util/CommandManager.java Thu Aug 28 18:12:25 2014
@@ -55,9 +55,7 @@ public class CommandManager {
// command ignored
}
}
- } catch (RuntimeException e) {
- LOGGER.log(Level.SEVERE, "an error occured while getting commands", e);
- } catch (IOException e) {
+ } catch (RuntimeException | IOException e) {
LOGGER.log(Level.SEVERE, "an error occured while getting commands", e);
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/AllowedOperationsBmpBean.java Thu Aug 28 18:12:25 2014
@@ -309,8 +309,7 @@ public class AllowedOperationsBmpBean im
jndiContext.lookup("java:comp/env/stateless/references/JNDI_access_to_java_comp_env");
policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
- } catch (final IllegalStateException ise) {
- } catch (final NamingException ne) {
+ } catch (final IllegalStateException | NamingException ise) {
}
allowedOperationsTable.put(methodName, policy);
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/BasicBmpBean.java Thu Aug 28 18:12:25 2014
@@ -332,9 +332,7 @@ public class BasicBmpBean implements jav
} finally {
con.close();
}
- } catch (final NamingException e) {
- throw new EJBException(e);
- } catch (final SQLException e) {
+ } catch (final NamingException | SQLException e) {
throw new EJBException(e);
}
}
@@ -508,8 +506,7 @@ public class BasicBmpBean implements jav
final String actual = (String) jndiContext.lookup("java:comp/env/stateless/references/JNDI_access_to_java_comp_env");
policy.allow(policy.JNDI_access_to_java_comp_env);
- } catch (final IllegalStateException ise) {
- } catch (final javax.naming.NamingException ne) {
+ } catch (final IllegalStateException | NamingException ise) {
}
allowedOperationsTable.put(methodName, policy);
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmp2Bean.java Thu Aug 28 18:12:25 2014
@@ -292,8 +292,7 @@ public abstract class AllowedOperationsC
jndiContext.lookup("java:comp/env/stateless/references/JNDI_access_to_java_comp_env");
policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
- } catch (final IllegalStateException ise) {
- } catch (final NamingException ne) {
+ } catch (final IllegalStateException | NamingException ise) {
}
allowedOperationsTable.put(methodName, policy);
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/AllowedOperationsCmpBean.java Thu Aug 28 18:12:25 2014
@@ -297,8 +297,7 @@ public class AllowedOperationsCmpBean im
jndiContext.lookup("java:comp/env/stateless/references/JNDI_access_to_java_comp_env");
policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
- } catch (final IllegalStateException ise) {
- } catch (final NamingException ne) {
+ } catch (final IllegalStateException | NamingException ise) {
}
allowedOperationsTable.put(methodName, policy);
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/BasicMdbBean.java Thu Aug 28 18:12:25 2014
@@ -220,8 +220,7 @@ public class BasicMdbBean implements Bas
final String actual = (String) jndiContext.lookup("java:comp/env/stateless/references/JNDI_access_to_java_comp_env");
policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
- } catch (final IllegalStateException ignored) {
- } catch (final javax.naming.NamingException ignored) {
+ } catch (final IllegalStateException | javax.naming.NamingException ignored) {
}
/*[11] Test lookup /////////*/
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/BasicSingletonBean.java Thu Aug 28 18:12:25 2014
@@ -248,8 +248,7 @@ public class BasicSingletonBean implemen
final String actual = (String) jndiContext.lookup("java:comp/env/singleton/references/JNDI_access_to_java_comp_env");
policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
- } catch (final IllegalStateException ise) {
- } catch (final NamingException ne) {
+ } catch (final IllegalStateException | NamingException ise) {
}
/*[11] Test lookup /////////*/
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/BasicStatelessBean.java Thu Aug 28 18:12:25 2014
@@ -252,8 +252,7 @@ public class BasicStatelessBean implemen
final String actual = (String) jndiContext.lookup("java:comp/env/stateless/references/JNDI_access_to_java_comp_env");
policy.allow(OperationsPolicy.JNDI_access_to_java_comp_env);
- } catch (final IllegalStateException ise) {
- } catch (final NamingException ne) {
+ } catch (final IllegalStateException | NamingException ise) {
}
/*[11] Test lookup /////////*/
Modified: tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java (original)
+++ tomee/tomee/trunk/maven/jarstxt-maven-plugin/src/main/java/org/apache/openejb/maven/jarstxt/JarsTxtMojo.java Thu Aug 28 18:12:25 2014
@@ -125,9 +125,7 @@ public class JarsTxtMojo extends Abstrac
final Artifact artifact = factory.createDependencyArtifact(a.getGroupId(), a.getArtifactId(), VersionRange.createFromVersion(a.getVersion()), a.getType(), a.getClassifier(), a.getScope());
try {
resolver.resolve(artifact, remoteRepos, local);
- } catch (final ArtifactResolutionException e) {
- throw new MojoExecutionException(e.getMessage(), e);
- } catch (ArtifactNotFoundException e) {
+ } catch (final ArtifactResolutionException | ArtifactNotFoundException e) {
throw new MojoExecutionException(e.getMessage(), e);
}
final File file = artifact.getFile();
Modified: tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java (original)
+++ tomee/tomee/trunk/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java Thu Aug 28 18:12:25 2014
@@ -91,8 +91,6 @@ public class EjbRpcProvider extends RPCP
Object result = container.invoke(ejbDeployment.getDeploymentID(), InterfaceType.SERVICE_ENDPOINT, callInterface, operation.getMethod(), arguments, null);
interceptor.createResult(result);
- } catch (InvalidateReferenceException e) {
- interceptor.createExceptionResult(e.getCause());
} catch (ApplicationException e) {
interceptor.createExceptionResult(e.getCause());
} catch (Throwable throwable) {
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java Thu Aug 28 18:12:25 2014
@@ -69,9 +69,7 @@ public class ClientDataSource implements
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
try {
Class.forName(jdbcDriver, true, classLoader);
- } catch (ClassNotFoundException e) {
- throw new IllegalStateException("Cannot use DataSource in client VM without the JDBC Driver in classpath: " + jdbcDriver, e);
- } catch (NoClassDefFoundError e) {
+ } catch (ClassNotFoundException | NoClassDefFoundError e) {
throw new IllegalStateException("Cannot use DataSource in client VM without the JDBC Driver in classpath: " + jdbcDriver, e);
}
}
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/HttpConnectionFactory.java Thu Aug 28 18:12:25 2014
@@ -76,9 +76,7 @@ public class HttpConnectionFactory imple
if (params.containsKey("sslKeyStore") || params.containsKey("sslTrustStore")) {
try {
((HttpsURLConnection) httpURLConnection).setSSLSocketFactory(new SSLContextBuilder(params).build().getSocketFactory());
- } catch (final NoSuchAlgorithmException e) {
- throw new ClientRuntimeException(e.getMessage(), e);
- } catch (final KeyManagementException e) {
+ } catch (final NoSuchAlgorithmException | KeyManagementException e) {
throw new ClientRuntimeException(e.getMessage(), e);
}
}
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastConnectionFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastConnectionFactory.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastConnectionFactory.java Thu Aug 28 18:12:25 2014
@@ -71,8 +71,6 @@ public class MulticastConnectionFactory
try {
serviceURI = unwrap(serviceURI); // cut group:
serviceURI = unwrap(serviceURI); // cut ejb:
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException("Invalid ejb service uri " + serviceURI.toString(), e);
} catch (Exception e) {
throw new IllegalArgumentException("Invalid ejb service uri " + serviceURI.toString(), e);
}
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ResourceFinder.java Thu Aug 28 18:12:25 2014
@@ -1067,12 +1067,8 @@ public class ResourceFinder {
return resourceURL;
}
}
- } catch (MalformedURLException e) {
+ } catch (SecurityException | IOException e) {
// Keep iterating through the URL list
- } catch (IOException e) {
- //Ignore
- } catch (SecurityException e) {
- //Ignore
}
}
return null;
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ServiceLocator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ServiceLocator.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ServiceLocator.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/ServiceLocator.java Thu Aug 28 18:12:25 2014
@@ -58,9 +58,7 @@ public class ServiceLocator {
public Object lookup(final String name) {
try {
return context.lookup(name);
- } catch (NamingException e) {
- throw new IllegalArgumentException(e);
- } catch (RuntimeException e) {
+ } catch (NamingException | RuntimeException e) {
throw new IllegalArgumentException(e);
}
}
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/SocketConnectionFactory.java Thu Aug 28 18:12:25 2014
@@ -408,9 +408,6 @@ public class SocketConnectionFactory imp
return new Output(this.out);
- } catch (IOException e) {
- throw this.failure("Cannot open output stream to server: " + e.getClass().getName(), e);
-
} catch (Throwable e) {
throw this.failure("Cannot open output stream to server: " + e.getClass().getName(), e);
}
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java Thu Aug 28 18:12:25 2014
@@ -108,13 +108,7 @@ public class Jdk13ProxyFactory implement
//noinspection RedundantArrayCreation
return cons.newInstance(new Object[]{new Jdk13InvocationHandler()});
- } catch (NoSuchMethodException e) {
- throw new InternalError(e.toString());
- } catch (IllegalAccessException e) {
- throw new InternalError(e.toString());
- } catch (InstantiationException e) {
- throw new InternalError(e.toString());
- } catch (InvocationTargetException e) {
+ } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
throw new InternalError(e.toString());
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java Thu Aug 28 18:12:25 2014
@@ -75,9 +75,7 @@ public class CxfContainerClassLoader ext
// some additional cxf classes can be provided by apps
try {
return tccl().loadClass(name);
- } catch (final Exception e) {
- // no-op: try tccl
- } catch (final Error err) {
+ } catch (final Exception | Error e) {
// no-op: try tccl
}
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Thu Aug 28 18:12:25 2014
@@ -91,9 +91,7 @@ public class EjbDaemon implements org.ap
if (serializer != null) {
try {
this.serializer = EJBDSerializer.class.cast(Thread.currentThread().getContextClassLoader().loadClass(serializer).newInstance());
- } catch (final ClassNotFoundException cnfe) { // let's try later with app classloader
- this.serializer = new ContextualSerializer(serializer);
- } catch (final NoClassDefFoundError cnfe) { // let's try later with app classloader
+ } catch (final ClassNotFoundException | NoClassDefFoundError cnfe) { // let's try later with app classloader
this.serializer = new ContextualSerializer(serializer);
}
}
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java Thu Aug 28 18:12:25 2014
@@ -112,9 +112,7 @@ public class JettyHttpServer implements
final HttpRequest httpRequest = new ServletRequestAdapter(req, res, servletContext);
final HttpResponse httpResponse = new ServletResponseAdapter(res);
JettyHttpServer.this.listener.onMessage(httpRequest, httpResponse);
- } catch (IOException e) {
- throw e;
- } catch (ServletException e) {
+ } catch (IOException | ServletException e) {
throw e;
} catch (Exception e) {
throw new ServletException(e);
Modified: tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java (original)
+++ tomee/tomee/trunk/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java Thu Aug 28 18:12:25 2014
@@ -567,14 +567,7 @@ public class MultipointServer {
if (key.isWritable())
doWrite(key);
- } catch (CancelledKeyException ex) {
- synchronized (connect) {
- final Session session = (Session) key.attachment();
- if (session.state != State.CLOSED) {
- close(key);
- }
- }
- } catch (ClosedChannelException ex) {
+ } catch (CancelledKeyException | ClosedChannelException ex) {
synchronized (connect) {
final Session session = (Session) key.attachment();
if (session.state != State.CLOSED) {
Modified: tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java (original)
+++ tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java Thu Aug 28 18:12:25 2014
@@ -51,9 +51,7 @@ public class RsServlet extends HttpServl
try {
listener.onMessage(httpRequest, httpResponse);
- } catch (IOException e) {
- throw e;
- } catch (ServletException e) {
+ } catch (IOException | ServletException e) {
throw e;
} catch (Exception e) {
throw new ServletException("Error processing webservice request", e);
Modified: tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java (original)
+++ tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java Thu Aug 28 18:12:25 2014
@@ -96,9 +96,7 @@ public class WsServlet implements Servle
try {
service.onMessage(httpRequest, httpResponse);
- } catch (IOException e) {
- throw e;
- } catch (ServletException e) {
+ } catch (IOException | ServletException e) {
throw e;
} catch (Exception e) {
throw new ServletException("Error processing webservice request", e);
Modified: tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java (original)
+++ tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java Thu Aug 28 18:12:25 2014
@@ -52,9 +52,7 @@ public class SaajMetaFactoryImpl extends
} else {
throw new SOAPException("Error calling factory method: " + methodName, e);
}
- } catch (IllegalArgumentException e) {
- throw new SOAPException("Error calling factory method: " + methodName, e);
- } catch (IllegalAccessException e) {
+ } catch (IllegalArgumentException | IllegalAccessException e) {
throw new SOAPException("Error calling factory method: " + methodName, e);
} finally {
method.setAccessible(accessibility);
Modified: tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java (original)
+++ tomee/tomee/trunk/tomee/apache-tomee/src/main/java/org/apache/tomee/RemoteTomEEEJBContainer.java Thu Aug 28 18:12:25 2014
@@ -129,9 +129,7 @@ public class RemoteTomEEEJBContainer ext
} // else suppose already deployed
return instance;
- } catch (final OpenEJBException e) {
- throw new EJBException(e);
- } catch (final MalformedURLException e) {
+ } catch (final OpenEJBException | MalformedURLException e) {
throw new EJBException(e);
} catch (final ValidationException ve) {
throw ve;
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java Thu Aug 28 18:12:25 2014
@@ -46,11 +46,7 @@ public class JavaeeInstanceManager imple
final Object object = webContext.newInstance(clazz);
postConstruct(object, clazz);
return object;
- } catch (final OpenEJBException e) {
- throw (InstantiationException) new InstantiationException(e.getMessage()).initCause(e);
- } catch (final WebBeansConfigurationException e) {
- throw (InstantiationException) new InstantiationException(e.getMessage()).initCause(e);
- } catch (final WebBeansCreationException e) {
+ } catch (final OpenEJBException | WebBeansCreationException | WebBeansConfigurationException e) {
throw (InstantiationException) new InstantiationException(e.getMessage()).initCause(e);
}
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Thu Aug 28 18:12:25 2014
@@ -127,9 +127,7 @@ public class OpenEJBContextConfig extend
try { // if no jaxws classes are here don't try anything
OpenEJBContextConfig.class.getClassLoader().loadClass("org.apache.openejb.server.webservices.WsServlet");
- } catch (final ClassNotFoundException e) {
- return;
- } catch (final NoClassDefFoundError e) {
+ } catch (final ClassNotFoundException | NoClassDefFoundError e) {
return;
}
@@ -203,9 +201,7 @@ public class OpenEJBContextConfig extend
context.removeChild(child);
}
}
- } catch (final NoClassDefFoundError e) {
- context.removeChild(child);
- } catch (final ClassNotFoundException e) {
+ } catch (final NoClassDefFoundError | ClassNotFoundException e) {
context.removeChild(child);
}
}
@@ -403,9 +399,7 @@ public class OpenEJBContextConfig extend
final ServletContainerInitializer instance = (ServletContainerInitializer) myfacesInitializer.newInstance();
context.addServletContainerInitializer(instance, getJsfClasses(context));
context.addApplicationListener(TOMEE_MYFACES_CONTEXT_LISTENER); // cleanup listener
- } catch (final Exception ignored) {
- // no-op
- } catch (final NoClassDefFoundError error) {
+ } catch (final Exception | NoClassDefFoundError ignored) {
// no-op
}
}
@@ -465,9 +459,7 @@ public class OpenEJBContextConfig extend
final ServletContainerInitializer instance = (ServletContainerInitializer) initializer.newInstance();
typeInitializerMap.put(Class.forName("org.springframework.web.WebApplicationInitializer", true, loader), Collections.singleton(instance));
initializerClassMap.put(instance, new HashSet<Class<?>>());
- } catch (final Exception ignored) {
- // no-op
- } catch (final NoClassDefFoundError error) {
+ } catch (final Exception | NoClassDefFoundError ignored) {
// no-op
}
@@ -626,8 +618,6 @@ public class OpenEJBContextConfig extend
try {
is = new URL(url).openStream();
super.processAnnotationsStream(is, fragment, handlesTypeOnly);
- } catch (final MalformedURLException e) {
- throw new IllegalArgumentException(e);
} catch (final IOException e) {
throw new IllegalArgumentException(e);
} finally {
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEClassLoaderEnricher.java Thu Aug 28 18:12:25 2014
@@ -96,10 +96,8 @@ public final class TomEEClassLoaderEnric
continue;
}
urls.add(file.toURI().toURL());
- } catch (final Exception e) {
+ } catch (final Exception | NoClassDefFoundError e) {
// ignore
- } catch (final NoClassDefFoundError error) {
- // no-op
}
}
}
Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/valve/MinimumErrorReportValve.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/valve/MinimumErrorReportValve.java?rev=1621173&r1=1621172&r2=1621173&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/valve/MinimumErrorReportValve.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/valve/MinimumErrorReportValve.java Thu Aug 28 18:12:25 2014
@@ -58,9 +58,7 @@ public class MinimumErrorReportValve ext
"</body>\n" +
"</html>\n");
}
- } catch (final IOException e) {
- // Ignore
- } catch (final IllegalStateException e) {
+ } catch (final IOException | IllegalStateException e) {
// Ignore
}
}