Author: tveronezi
Date: Wed Nov 27 13:28:56 2013
New Revision: 1546027
URL: http://svn.apache.org/r1546027
Log:
https://issues.apache.org/jira/browse/OPENEJB-2052
PMD EmptyIfStmt
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
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/cdi/CdiAppContextsService.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.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/WsDeployer.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAsynchronous.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/rules/CheckMethods.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/cmp/cmp2/Cmp2Generator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
Wed Nov 27 13:28:56 2013
@@ -11,7 +11,6 @@
<!-- All the rules from empty.xml -->
<rule ref="rulesets/java/empty.xml">
<exclude name="EmptyCatchBlock"/>
- <exclude name="EmptyIfStmt"/>
</rule>
<!-- overriding EmptyCatchBlock -->
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=1546027&r1=1546026&r2=1546027&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
Wed Nov 27 13:28:56 2013
@@ -653,9 +653,7 @@ public class OpenEjbContainer extends EJ
} else {
matches = s2.equals(s + ".jar");
}
- if (!matches) {
- //TODO look for ejb-jar.xml with matching module name
- }
+ // TODO if (!matches) { /* look for ejb-jar.xml with matching
module name */ }
return matches;
}
}
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=1546027&r1=1546026&r2=1546027&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
Wed Nov 27 13:28:56 2013
@@ -1453,8 +1453,8 @@ public class Assembler extends Assembler
}
} else if (ExecutorService.class.isInstance(object)) {
ExecutorService.class.cast(object).shutdown();
- } else if (DataSource.class.isInstance(object)) {
- //Do nothing?
+ } else if (DataSource.class.isInstance(object)) { //NOPMD
+ //no-op. Just don't log the debug message below.
} else if (logger.isDebugEnabled()) {
logger.debug("Not processing resource on destroy: " + className);
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
Wed Nov 27 13:28:56 2013
@@ -162,7 +162,7 @@ public class CdiAppContextsService exten
destroySessionContext((HttpSession) endParameters);
} else if (scopeType.equals(ApplicationScoped.class)) {
destroyApplicationContext();
- } else if (scopeType.equals(Dependent.class)) {
+ } else if (scopeType.equals(Dependent.class)) { //NOPMD
// Do nothing
} else if (scopeType.equals(Singleton.class)) {
destroySingletonContext();
@@ -209,7 +209,7 @@ public class CdiAppContextsService exten
initApplicationContext();
} else if (scopeType.equals(Dependent.class)) {
initSingletonContext();
- } else if (scopeType.equals(Singleton.class)) {
+ } else if (scopeType.equals(Singleton.class)) { //NOPMD
// Do nothing
} else if (supportsConversation() &&
scopeType.equals(ConversationScoped.class)) {
initConversationContext((ConversationContext) startParameter);
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Wed Nov 27 13:28:56 2013
@@ -563,13 +563,13 @@ public class AnnotationDeployer implemen
// are we allowed to have more than one connector class? Not
without a deployment descriptor
if (connector.getResourceAdapter() == null ||
connector.getResourceAdapter().getResourceAdapterClass() == null ||
connector.getResourceAdapter().getResourceAdapterClass().length() == 0) {
- if (connectorClasses.size() == 0) {
- // fail some validation here too
+ if (connectorClasses.size() == 0) { //NOPMD
+ // TODO: fail some validation here too
}
- if (connectorClasses.size() > 1) {
+ if (connectorClasses.size() > 1) { //NOPMD
// too many connector classes, this is against
the spec
- // something like
connectorModule.getValidation().fail(ejbName, "abstractAnnotatedAsBean",
annotationClass.getSimpleName(), beanClass.get().getName());
+ // TODO: something like
connectorModule.getValidation().fail(ejbName, "abstractAnnotatedAsBean",
annotationClass.getSimpleName(), beanClass.get().getName());
}
}
@@ -680,8 +680,6 @@ public class AnnotationDeployer implemen
if
(outboundResourceAdapter.isReauthenticationSupport() == null) {
outboundResourceAdapter.setReauthenticationSupport(connectorAnnotation.reauthenticationSupport());
}
- } else {
- // we couldn't process a connector class - probably a
validation issue which we should warn about.
}
// process @ConnectionDescription(s)
@@ -3982,62 +3980,18 @@ public class AnnotationDeployer implemen
if (Modifier.isFinal(clazz.getModifiers())) return false;
return true;
-// // This limits @LocalBean references to things in the same module
-// DeploymentModule module = getModule();
-// if (module instanceof EjbModule) {
-// Set<String> localbeans = new HashSet<String>();
-// EjbModule ejbModule = (EjbModule) module;
-// for (EnterpriseBean bean :
ejbModule.getEjbJar().getEnterpriseBeans()) {
-// if (bean instanceof SessionBean) {
-// if (((SessionBean) bean).getLocalBean() != null) {
-// localbeans.add(bean.getEjbClass());
-// }
-// }
-// }
-//
-// if (localbeans.contains(clazz.getName())) {
-// return true;
-// }
-// }
-//
-// return false;
}
private boolean isValidEjbInterface(String b, Class clazz, String
refName) {
- if (!clazz.isInterface()) {
-
-// DeploymentModule module = getModule();
-// if (module instanceof EjbModule) {
-// Set<String> beanClasses = new HashSet<String>();
-// EjbModule ejbModule = (EjbModule) module;
-// for (EnterpriseBean bean :
ejbModule.getEjbJar().getEnterpriseBeans()) {
-// beanClasses.add(bean.getEjbClass());
-// }
-//
-// if (beanClasses.contains(clazz.getName())) {
-// fail(b, "ann.ejb.beanClass", clazz.getName(),
refName);
-// } else {
-// fail(b, "ann.ejb.notInterface", clazz.getName(),
refName);
-// }
-// } else {
-// fail(b, "ann.ejb.notInterface", clazz.getName(),
refName);
-// }
-//
-// return false;
-
+ if (!clazz.isInterface()) { //NOPMD
+ //It is not an interface. No validation necessary.
} else if (EJBObject.class.isAssignableFrom(clazz)) {
-
fail(b, "ann.ejb.ejbObject", clazz.getName(), refName);
-
return false;
-
} else if (EJBLocalObject.class.isAssignableFrom(clazz)) {
-
fail(b, "ann.ejb.ejbLocalObject", clazz.getName(), refName);
-
return false;
}
-
return true;
}
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=1546027&r1=1546026&r2=1546027&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
Wed Nov 27 13:28:56 2013
@@ -493,9 +493,6 @@ public class ReadDescriptors implements
}
} else if (raw instanceof Beans) {
ejbModule.setBeans((Beans) raw);
- } else {
-// DeploymentLoader.logger.debug("No beans.xml found assuming
annotated beans present: " + appModule.getJarLocation() + ", module: " +
ejbModule.getModuleId());
-// ejbModule.setBeans(new Beans());
}
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
Wed Nov 27 13:28:56 2013
@@ -282,9 +282,8 @@ public class WsDeployer implements Dynam
webserviceDescription = new WebserviceDescription();
if (JaxWsUtils.isWebService(ejbClass)) {
webserviceDescription.setWebserviceDescriptionName(JaxWsUtils.getServiceName(ejbClass));
- } else {
- // todo create webserviceDescription name using some sort
of jaxrpc data
}
+ // TODO else { /* create webserviceDescription name using some
sort of jaxrpc data */ }
webservices.getWebserviceDescription().add(webserviceDescription);
}
@@ -361,9 +360,8 @@ public class WsDeployer implements Dynam
portComponent.setHandlerChains(handlerChains);
}
- } else {
- // todo location JAX-RPC services comes from wsdl file
}
+ // TODO else { /* location JAX-RPC services comes from wsdl file
*/ }
}
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAssemblyBindings.java
Wed Nov 27 13:28:56 2013
@@ -66,7 +66,8 @@ public class CheckAssemblyBindings exten
for (Method method : permission.getMethod()) {
if (method.getEjbName() == null) {
fail("MethodPermission",
"methodPermission.ejbNameRequired", method.getMethodName(), join(",",
permission.getRoleName()));
- } else if (method.getEjbName().equals("*")){
+ } else if (method.getEjbName().equals("*")) { //NOPMD
+ // no-op. Just continue the loop.
} else if (!ejbsByName.containsKey(method.getEjbName())){
fail("MethodPermission", "methodPermission.noSuchEjbName",
method.getEjbName(), method.getMethodName(), join(",",
permission.getRoleName()));
}
@@ -77,7 +78,8 @@ public class CheckAssemblyBindings exten
for (Method method : transaction.getMethod()) {
if (method.getEjbName() == null) {
fail("ContainerTransaction",
"containerTransaction.ejbNameRequired", method.getMethodName(),
transaction.getTransAttribute());
- } else if (method.getEjbName().equals("*")){
+ } else if (method.getEjbName().equals("*")) { //NOPMD
+ // no-op. Just continue the loop.
} else if (!ejbsByName.containsKey(method.getEjbName())){
fail("ContainerTransaction",
"containerTransaction.noSuchEjbName", method.getEjbName(),
method.getMethodName(), transaction.getTransAttribute());
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAsynchronous.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAsynchronous.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAsynchronous.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckAsynchronous.java
Wed Nov 27 13:28:56 2013
@@ -68,8 +68,6 @@ public class CheckAsynchronous extends V
for (Method method : cls.getDeclaredMethods()) {
if (Modifier.isPublic(method.getModifiers()) &&
!method.isSynthetic()) {
checkAsynchronousMethod(session, ejbClass,
method, applicationExceptions);
- } else {
- //warn(session, "asynchronous.methodignored",
ejbClass.getName(), method.getName());
}
}
} catch (OpenEJBException e) {
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=1546027&r1=1546026&r2=1546027&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
Wed Nov 27 13:28:56 2013
@@ -270,19 +270,14 @@ public class CheckClasses extends Valida
}
private void check_isEjbClass(RemoteBean b) {
-
- if (b instanceof SessionBean) {
-
+ if (b instanceof SessionBean) { //NOPMD
// DMB: Beans in ejb 3 are not required to implement
javax.ejb.SessionBean
// but it would still be nice to think of some sort of check to do
here.
// compareTypes(b, b.getEjbClass(), javax.ejb.SessionBean.class);
} else if (b instanceof EntityBean) {
-
compareTypes(b, b.getEjbClass(), javax.ejb.EntityBean.class);
-
}
-
}
private Class<?> lookForClass(String clazz, String type, String ejbName) {
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckMethods.java
Wed Nov 27 13:28:56 2013
@@ -233,9 +233,8 @@ public class CheckMethods extends Valida
try {
if (javax.ejb.EnterpriseBean.class.isAssignableFrom(bean)) {
bean.getMethod(ejbCreateName.toString(),
create.getParameterTypes());
- } else {
- // TODO: Check for Init method in pojo session bean class
}
+ // TODO: else { /* Check for Init method in pojo session bean
class */ }
} catch (NoSuchMethodException e) {
result = false;
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=1546027&r1=1546026&r2=1546027&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
Wed Nov 27 13:28:56 2013
@@ -265,7 +265,7 @@ class SaxOpenejb extends StackHandler {
if (importedOpenEJB.securityService != null
|| importedOpenEJB.transactionManager != null
|| importedOpenEJB.connectionManager != null
- || importedOpenEJB.proxyFactory != null) {
+ || importedOpenEJB.proxyFactory != null) { //NOPMD
// do nothing, these are unique so i don't think importing it
is a good idea
}
if (importedOpenEJB.connector != null) {
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
Wed Nov 27 13:28:56 2013
@@ -1134,7 +1134,7 @@ public class Cmp2Generator implements Op
* @param to The target class for the conversion.
*/
public static void fromObjectTo(MethodVisitor mv, Class to) {
- if (to.equals(Object.class)) {
+ if (to.equals(Object.class)) { //NOPMD
// direct assignment will work
} else if (!to.isPrimitive()) {
mv.visitTypeInsn(CHECKCAST, Type.getInternalName(to));
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/ConnectorCallbackHandler.java
Wed Nov 27 13:28:56 2013
@@ -75,15 +75,14 @@ public class ConnectorCallbackHandler im
}
}
// server to jaspi communication
- // TODO implement these
- else if (callback instanceof CertStoreCallback) {
-
- } else if (callback instanceof PrivateKeyCallback) {
-
- } else if (callback instanceof SecretKeyCallback) {
-
- } else if (callback instanceof TrustStoreCallback) {
-
+ else if (callback instanceof CertStoreCallback) {
//NOPMD
+ // TODO implement me
+ } else if (callback instanceof PrivateKeyCallback) {
//NOPMD
+ // TODO implement me
+ } else if (callback instanceof SecretKeyCallback) {
//NOPMD
+ // TODO implement me
+ } else if (callback instanceof TrustStoreCallback) {
//NOPMD
+ // TODO implement me
} else {
throw new
UnsupportedCallbackException(callback);
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
Wed Nov 27 13:28:56 2013
@@ -183,7 +183,7 @@ public class DynamicSubclass implements
methods.add(method);
methodMap.put(method.getName(), methods);
} else {
- if (isOverridden(methods, method)) {
+ if (isOverridden(methods, method)) { //NOPMD
// method is overridden in superclass, so do nothing
} else {
// method is not overridden, so add it
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
Wed Nov 27 13:28:56 2013
@@ -176,8 +176,7 @@ public class Slf4jLogger extends Abstrac
} else {
locationAwareLogger.log(null, FQCN,
LocationAwareLogger.DEBUG_INT, msg, null, t);
}
- } else if (Level.OFF.equals(level)) {
- // don't log
}
+ // don't log if Level.OFF
}
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/LocalXAResource.java
Wed Nov 27 13:28:56 2013
@@ -43,9 +43,7 @@ public class LocalXAResource implements
@Override
public void start(final Xid xid, int flag) throws XAException {
try {
- if (!lock.tryLock(10, TimeUnit.MINUTES)) {
-
- }
+ lock.tryLock(10, TimeUnit.MINUTES);
} catch (InterruptedException e) {
throw (XAException) new XAException("can't get
lock").initCause(cantGetLock());
}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java?rev=1546027&r1=1546026&r2=1546027&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
Wed Nov 27 13:28:56 2013
@@ -65,7 +65,8 @@ public class Duration {
// skip whitespace
for (; i < s.length(); i++) {
char c = s.charAt(i);
- if (Character.isWhitespace(c)) {
+ if (Character.isWhitespace(c)) { //NOPMD
+ // no-op. Just continue the loop
} else {
break;
}
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=1546027&r1=1546026&r2=1546027&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
Wed Nov 27 13:28:56 2013
@@ -219,7 +219,7 @@ public class LocalBeanProxyFactory imple
methods.add(method);
methodMap.put(method.getName(), methods);
} else {
- if (isOverridden(methods, method)) {
+ if (isOverridden(methods, method)) { //NOPMD
// method is overridden in superclass, so do nothing
} else {
// method is not overridden, so add it
