Fixed some violations

diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/asm/AsmMethod.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/asm/AsmMethod.java
index daf109922986456907d23aca71be91c324e18d91..fe777498e1a1c56ba45995d2939a7f1a9933a21d 100644 (file)
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/asm/AsmMethod.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/asm/AsmMethod.java
@@ -190,7 +190,7 @@ public class AsmMethod extends AsmResource {
   }
 
   private boolean isMethodNotAccessorOrAccessingDifferentField(AsmMethod method) {
-    return !method.isAccessor() || (accessedField != null && accessedField != method.getAccessedField());
+    return !method.isAccessor() || (accessedField != null && !accessedField.equals(method.getAccessedField()));
   }
 
   private boolean isFieldAccesingDifferentField(AsmField field) {

diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/visitor/LCOM4Visitor.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/visitor/LCOM4Visitor.java
index 2bfd6d1cde658ad4358c6bae5530f072a696452f..31059478c961e44ed1059fb7386ca0e17aedf625 100644 (file)
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/visitor/LCOM4Visitor.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/bytecode/visitor/LCOM4Visitor.java
@@ -115,8 +115,7 @@ public class LCOM4Visitor extends BytecodeVisitor {
     Set<AsmResource> blockA = getOrCreateResourceBlock(resourceA);
     Set<AsmResource> blockB = getOrCreateResourceBlock(resourceB);
     
-    // getOrCreateResourceBlock() returns the same block instance if resourceA and resourceB are identical or already in the same block
-    if (blockA == blockB) { // NOSONAR false-positive Compare Objects With Equals
+    if (blockA.equals(blockB)) {
       return;
     }