You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/02/26 16:36:27 UTC
[tomee] branch master updated: Fix PMD issues with double-negation
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 4997652 Fix PMD issues with double-negation
new abec1c6 Merge remote-tracking branch 'apache/master'
4997652 is described below
commit 4997652e383d3925b933032cc63f51b63b5f7697
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Feb 26 16:34:44 2019 +0000
Fix PMD issues with double-negation
---
.../java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java | 2 +-
.../java/org/apache/openejb/core/managed/ManagedObjectHandler.java | 2 +-
.../org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java | 2 +-
.../apache/openejb/resource/jdbc/managed/local/ManagedConnection.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
index 108960d..f789bcd 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
@@ -139,7 +139,7 @@ public class EntityEjbObjectHandler extends EjbObjectProxyHandler {
return containerId.equals(that.containerId) &&
deploymentId.equals(that.deploymentId) &&
- !(!Objects.equals(primaryKey, that.primaryKey));
+ Objects.equals(primaryKey, that.primaryKey);
}
public int hashCode() {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java
index a52e3b4..df25df6 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java
@@ -107,7 +107,7 @@ public class ManagedObjectHandler extends EjbObjectProxyHandler {
return containerId.equals(that.containerId) &&
deploymentId.equals(that.deploymentId) &&
- !(!Objects.equals(primaryKey, that.primaryKey));
+ Objects.equals(primaryKey, that.primaryKey);
}
public int hashCode() {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java
index 2cede4a..2413e4a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java
@@ -107,7 +107,7 @@ public class StatefulEjbObjectHandler extends EjbObjectProxyHandler {
return containerId.equals(that.containerId) &&
deploymentId.equals(that.deploymentId) &&
- !(!Objects.equals(primaryKey, that.primaryKey));
+ Objects.equals(primaryKey, that.primaryKey);
}
public int hashCode() {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
index b34e438..45ef356 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/managed/local/ManagedConnection.java
@@ -314,8 +314,8 @@ public class ManagedConnection implements InvocationHandler {
Key key = Key.class.cast(o);
return (ds == key.ds || ds.equals(key.ds)) &&
- !(!Objects.equals(user, key.user)) &&
- !(!Objects.equals(pwd, key.pwd));
+ Objects.equals(user, key.user) &&
+ Objects.equals(pwd, key.pwd);
}
@Override