Modified: tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java (original) +++ tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/common/AbstractObjectFactory.java Thu Aug 28 18:12:25 2014 @@ -96,8 +96,8 @@ public abstract class AbstractObjectFact final Context externalContext = getContext(jndiProviderId); synchronized (externalContext) { /* According to the JNDI SPI specification multiple threads may not access the same JNDI - Context *instance* concurrently. Since we don't know the origines of the federated context we must - synchonrize access to it. JNDI SPI Sepecifiation 1.2 Section 2.2 + Context *instance* concurrently. Since we don't know the origins of the federated context we must + synchronize access to it. JNDI SPI Specification 1.2 Section 2.2 */ return externalContext.lookup(jndiName); }
Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java?rev=1621173&r1=1621172&r2=1621173&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java (original) +++ tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/EmbeddedTomEEContainer.java Thu Aug 28 18:12:25 2014 @@ -164,10 +164,7 @@ public final class EmbeddedTomEEContaine } return tomEEContainer; - } catch (final OpenEJBException e) { - tomEEContainer.close(); - throw new EJBException(e); - } catch (final MalformedURLException e) { + } catch (final OpenEJBException | MalformedURLException e) { tomEEContainer.close(); throw new EJBException(e); } catch (final ValidationException ve) { Modified: tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProviderFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProviderFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProviderFactory.java (original) +++ tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigResourceProviderFactory.java Thu Aug 28 18:12:25 2014 @@ -49,15 +49,9 @@ public class TomEEFacesConfigResourcePro } else { returnValue = resolveFacesConfigResourceProviderFromService(externalContext); } - } catch (final ClassNotFoundException e) { + } catch (final ClassNotFoundException | NoClassDefFoundError e) { // ignore - } catch (final NoClassDefFoundError e) { - // ignore - } catch (final InstantiationException e) { - getLogger().log(Level.SEVERE, "", e); - } catch (final IllegalAccessException e) { - getLogger().log(Level.SEVERE, "", e); - } catch (final InvocationTargetException e) { + } catch (final InstantiationException | InvocationTargetException | IllegalAccessException e) { getLogger().log(Level.SEVERE, "", e); } catch (final PrivilegedActionException e) { throw new FacesException(e); Modified: tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java?rev=1621173&r1=1621172&r2=1621173&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java (original) +++ tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java Thu Aug 28 18:12:25 2014 @@ -47,15 +47,9 @@ public class TomEEFacesConfigurationProv try { returnValue = resolveFacesConfigurationProviderFromService(extContext); externalContext.getApplicationMap().put(FACES_CONFIGURATION_PROVIDER_INSTANCE_KEY, returnValue); - } catch (final ClassNotFoundException e) { + } catch (final ClassNotFoundException | NoClassDefFoundError e) { // ignore - } catch (final NoClassDefFoundError e) { - // ignore - } catch (final InstantiationException e) { - getLogger().log(Level.SEVERE, "", e); - } catch (final IllegalAccessException e) { - getLogger().log(Level.SEVERE, "", e); - } catch (final InvocationTargetException e) { + } catch (final InstantiationException | InvocationTargetException | IllegalAccessException e) { getLogger().log(Level.SEVERE, "", e); } catch (final PrivilegedActionException e) { throw new FacesException(e); Modified: tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java?rev=1621173&r1=1621172&r2=1621173&view=diff ============================================================================== --- tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java (original) +++ tomee/tomee/trunk/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEMyFacesContainerInitializer.java Thu Aug 28 18:12:25 2014 @@ -64,9 +64,7 @@ public class TomEEMyFacesContainerInitia try { ctx.getClassLoader().loadClass("com.sun.faces.context.SessionMap"); return; - } catch (final ClassNotFoundException cnfe) { - // no-op - } catch (final NoClassDefFoundError error) { + } catch (final ClassNotFoundException | NoClassDefFoundError cnfe) { // no-op }
