From d234f0fbdb75112af3f39a9b4fb85ac9fe0552ed Mon Sep 17 00:00:00 2001 From: Dinesh Bolkensteyn Date: Thu, 3 Nov 2011 09:59:01 +0100 Subject: [PATCH] Fixed some violations --- .../src/main/java/org/sonar/java/bytecode/asm/AsmMethod.java | 2 +- .../java/org/sonar/java/bytecode/visitor/LCOM4Visitor.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 daf10992298..fe777498e1a 100644 --- 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 2bfd6d1cde6..31059478c96 100644 --- 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 blockA = getOrCreateResourceBlock(resourceA); Set 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; } -- 2.39.5