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

Fix concurrency issue in the Journey class by synchronizing the ArrayList #264

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix concurrency issue in the Journey class by synchronizing the ArrayList #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 17 additions & 12 deletions moskito-core/src/main/java/net/anotheria/moskito/core/journey/Journey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.anotheria.moskito.core.calltrace.CurrentlyTracedCall;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
Expand Down Expand Up @@ -43,7 +44,7 @@ public Journey(String aName){
name = aName;
createdTimestamp = System.currentTimeMillis();
active = true;
tracedCalls = new ArrayList<>();
tracedCalls = Collections.synchronizedList(new ArrayList<>());
}

/**
Expand Down Expand Up @@ -94,23 +95,27 @@ public String toString(){
}

public void removeStepByName(String stepName){
for (int i=0; i<tracedCalls.size(); i++){
CurrentlyTracedCall ctc = tracedCalls.get(i);
if (ctc.getName().equals(stepName)){
tracedCalls.remove(i);
return;
}
synchronized (tracedCalls) {
for (int i=0; i<tracedCalls.size(); i++){
CurrentlyTracedCall ctc = tracedCalls.get(i);
if (ctc.getName().equals(stepName)){
tracedCalls.remove(i);
return;
}

}
}
}

public CurrentlyTracedCall getStepByName(String stepName){
for (int i=0; i<tracedCalls.size(); i++){
CurrentlyTracedCall ctc = tracedCalls.get(i);
if (ctc.getName().equals(stepName)){
return ctc;
}
synchronized (tracedCalls) {
for (int i=0; i<tracedCalls.size(); i++){
CurrentlyTracedCall ctc = tracedCalls.get(i);
if (ctc.getName().equals(stepName)){
return ctc;
}

}
}
return null;
}
Expand Down