phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix false positive on UnsynchronizedStaticFormatterRule

Browse Source
This commit is contained in:
Juan Martín Sotuyo Dodero
2019-07-18 19:35:09 -03:00
parent ca34d4fa1c
commit cb62b7e472
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterRule.java
View File

@ -77,14 +77,7 @@ public class UnsynchronizedStaticFormatterRule extends AbstractJavaRule {
continue;
}
if (getProperty(ALLOW_METHOD_LEVEL_SYNC)) {
ASTMethodDeclaration method = n.getFirstParentOfType(ASTMethodDeclaration.class);
if (method != null && (!method.isSynchronized() || !method.isStatic())) {
addViolation(data, node);
}
continue;
}
// is there a block-level synch?
ASTSynchronizedStatement syncStatement = n.getFirstParentOfType(ASTSynchronizedStatement.class);
if (syncStatement != null) {
ASTExpression expression = syncStatement.getFirstChildOfType(ASTExpression.class);
@ -95,6 +88,15 @@ public class UnsynchronizedStaticFormatterRule extends AbstractJavaRule {
}
}
}
// method level synch enabled and used?
if (getProperty(ALLOW_METHOD_LEVEL_SYNC)) {
ASTMethodDeclaration method = n.getFirstParentOfType(ASTMethodDeclaration.class);
if (method != null && method.isSynchronized() && method.isStatic()) {
continue;
}
}
addViolation(data, n);
}
return data;