Repository: tomee Updated Branches: refs/heads/tomee-1.7.x dec4431dd -> 0d749467f
PMD 3.6 broken Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0d749467 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0d749467 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0d749467 Branch: refs/heads/tomee-1.7.x Commit: 0d749467f1b572cbe6744d5abee896db80feddf4 Parents: dec4431 Author: AndyGee <andy...@gmx.de> Authored: Fri Feb 19 20:10:58 2016 +0100 Committer: AndyGee <andy...@gmx.de> Committed: Fri Feb 19 20:10:58 2016 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/config/rules/CheckCallbacks.java | 11 ++++++----- .../org/apache/openejb/core/ivm/BaseEjbProxyHandler.java | 2 +- pom.xml | 2 +- src/main/style/pmd/openejb-basic.xml | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/0d749467/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java index 0c81c34..bff3190 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckCallbacks.java @@ -53,9 +53,10 @@ import java.util.List; */ public class CheckCallbacks extends ValidationBase { + @Override public void validate(final EjbModule module) { for (final EnterpriseBean bean : module.getEjbJar().getEnterpriseBeans()) { - Class ejbClass = null; + final Class ejbClass; try { ejbClass = loadClass(bean.getEjbClass()); } catch (final OpenEJBException e) { @@ -199,7 +200,7 @@ public class CheckCallbacks extends ValidationBase { } for (final Interceptor interceptor : module.getEjbJar().getInterceptors()) { - Class interceptorClass = null; + final Class interceptorClass; try { interceptorClass = loadClass(interceptor.getInterceptorClass()); } catch (final OpenEJBException e) { @@ -246,7 +247,7 @@ public class CheckCallbacks extends ValidationBase { private void checkAroundTypeInvoke(final String aroundType, final Class ejbClass, final String declaringClassName, final String declaringMethodName, final String componentName) { try { - Class<?> declaringClass = null; + final Class<?> declaringClass; try { declaringClass = declaringClassName == null ? ejbClass : loadClass(declaringClassName); } catch (final OpenEJBException e) { @@ -299,7 +300,7 @@ public class CheckCallbacks extends ValidationBase { private void checkCallback(final Class<?> ejbClass, final String type, final CallbackMethod callback, final EnterpriseBean bean, final Class... parameterTypes) { try { - Class<?> delcaringClass = null; + final Class<?> delcaringClass; try { delcaringClass = callback.getClassName() == null ? ejbClass : loadClass(callback.getClassName()); } catch (final OpenEJBException e) { @@ -370,7 +371,7 @@ public class CheckCallbacks extends ValidationBase { private void checkCallback(final Class interceptorClass, final String type, final CallbackMethod callback, final Interceptor interceptor) { try { - Class<?> delcaringClass = null; + final Class<?> delcaringClass; try { delcaringClass = callback.getClassName() == null ? interceptorClass : loadClass(callback.getClassName()); } catch (final OpenEJBException e) { http://git-wip-us.apache.org/repos/asf/tomee/blob/0d749467/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java index 5067f2b..9f2d0ca 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/BaseEjbProxyHandler.java @@ -316,7 +316,7 @@ public abstract class BaseEjbProxyHandler implements InvocationHandler, Serializ final IntraVmCopyMonitor.State oldStrategy = strategy; if (getBeanContext().isAsynchronous(method) || getBeanContext().getComponentType().equals(BeanType.MANAGED)) { - strategy = IntraVmCopyMonitor.State.NONE; + strategy = NONE; } try { http://git-wip-us.apache.org/repos/asf/tomee/blob/0d749467/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8229b05..1d21f82 100644 --- a/pom.xml +++ b/pom.xml @@ -283,7 +283,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.6</version> + <version>3.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> http://git-wip-us.apache.org/repos/asf/tomee/blob/0d749467/src/main/style/pmd/openejb-basic.xml ---------------------------------------------------------------------- diff --git a/src/main/style/pmd/openejb-basic.xml b/src/main/style/pmd/openejb-basic.xml index c03d22f..2c37d31 100644 --- a/src/main/style/pmd/openejb-basic.xml +++ b/src/main/style/pmd/openejb-basic.xml @@ -34,5 +34,4 @@ <exclude name="AvoidThreadGroup"/> </rule> - </ruleset>