Author: bleny Date: 2014-07-24 11:18:39 +0200 (Thu, 24 Jul 2014) New Revision: 2163 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2163 Log: use multicatch clause Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-07-21 09:49:09 UTC (rev 2162) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-07-24 09:18:39 UTC (rev 2163) @@ -28,10 +28,9 @@ import fr.ifremer.wao.WaoTopiaPersistenceContext; import fr.ifremer.wao.services.service.BoatsFilterValues; import fr.ifremer.wao.services.service.BoatsFilterValuesCacheKey; -import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import fr.ifremer.wao.services.service.SamplingPlan; -import fr.ifremer.wao.services.service.Synthesis; import fr.ifremer.wao.services.service.SamplingPlanCacheKey; +import fr.ifremer.wao.services.service.Synthesis; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -78,18 +77,10 @@ throw new WaoTechnicalException("all services must provide a non-argument constructor", e); - } catch (InvocationTargetException e) { + } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) { throw new WaoTechnicalException("unable to instantiate service", e); - } catch (InstantiationException e) { - - throw new WaoTechnicalException("unable to instantiate service", e); - - } catch (IllegalAccessException e) { - - throw new WaoTechnicalException("unable to instantiate service", e); - } service.setServiceContext(this);