Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle warning regarding double locking #1228

Merged
merged 10 commits into from
Aug 8, 2024
Merged

Handle warning regarding double locking #1228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec18163
Set volatile flag on rules arraylists to satisfy double-lock standards
luis-pabon-tf Aug 5, 2024
8eb5e33
Revert volatile flag and use synchronizedList instead
luis-pabon-tf Aug 6, 2024
4a267f9
Change the sync block scopes to the rule arrays
luis-pabon-tf Aug 6, 2024
b5c799f
Added a volatile boolean to control the synchronization blocks
luis-pabon-tf Aug 6, 2024
725b708
Update rulesLoaded flag when unloading rules and on loading exceptions
luis-pabon-tf Aug 6, 2024
aef0005
Merge branch 'main' into chores/add-volatile-keywords
luis-pabon-tf Aug 7, 2024
1bfec98
Revert the synchronizedList usage as we don't need it with the recent…
luis-pabon-tf Aug 7, 2024
7dc84e6
Moved rulesLoaded flag to after the actual rule loading is done
luis-pabon-tf Aug 8, 2024
9444a77
Update etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleen…
luis-pabon-tf Aug 8, 2024
a71dcb7
Update etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleen…
luis-pabon-tf Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .../hhs/cdc/trustedintermediary/etor/ruleengine/transformation/TransformationRuleEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public class TransformationRuleEngine implements RuleEngine {
private String ruleDefinitionsFileName;
final List<TransformationRule> rules = new ArrayList<>();

volatile boolean rulesLoaded = false;
private static final TransformationRuleEngine INSTANCE = new TransformationRuleEngine();

@Inject Logger logger;
Expand All @@ -32,14 +32,14 @@ private TransformationRuleEngine() {}
@Override
public void unloadRules() {
rules.clear();
rulesLoaded = false;
}

@Override
public void ensureRulesLoaded() throws RuleLoaderException {
// Double-checked locking - needed to protect from excessive sync locks
if (rules.isEmpty()) {
synchronized (this) {
if (rules.isEmpty()) {
if (!rulesLoaded) {
synchronized (rules) {
if (!rulesLoaded) {
InputStream resourceStream =
getClass()
.getClassLoader()
Expand All @@ -51,7 +51,8 @@ public void ensureRulesLoaded() throws RuleLoaderException {
}
List<TransformationRule> parsedRules =
ruleLoader.loadRules(resourceStream, new TypeReference<>() {});
this.rules.addAll(parsedRules);
rules.addAll(parsedRules);
rulesLoaded = true;
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions ...java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/validation/ValidationRuleEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
public class ValidationRuleEngine implements RuleEngine {
private String ruleDefinitionsFileName;
final List<ValidationRule> rules = new ArrayList<>();

volatile boolean rulesLoaded = false;
private static final ValidationRuleEngine INSTANCE = new ValidationRuleEngine();

@Inject Logger logger;
Expand All @@ -32,14 +32,14 @@ private ValidationRuleEngine() {}
@Override
public void unloadRules() {
rules.clear();
rulesLoaded = false;
}

@Override
public void ensureRulesLoaded() throws RuleLoaderException {
// Double-checked locking - needed to protect from excessive sync locks
if (rules.isEmpty()) {
synchronized (this) {
if (rules.isEmpty()) {
if (!rulesLoaded) {
synchronized (rules) {
if (!rulesLoaded) {
InputStream resourceStream =
getClass()
.getClassLoader()
Expand All @@ -51,7 +51,8 @@ public void ensureRulesLoaded() throws RuleLoaderException {
}
List<ValidationRule> parsedRules =
ruleLoader.loadRules(resourceStream, new TypeReference<>() {});
this.rules.addAll(parsedRules);
rules.addAll(parsedRules);
rulesLoaded = true;
}
}
}
Expand Down