s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Protect joins map with mutex - fixes issue #652

Browse Source
This commit is contained in:
Tom Morris 2013-03-03 09:36:43 -05:00
parent 0dfd7d7112
commit eba03fc69e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/src/com/google/refine/InterProjectModel.java
View File

@ -99,27 +99,33 @@ public class InterProjectModel {
computeJoin(join); computeJoin(join);
_joins.put(key, join); synchronized (_joins) {
_joins.put(key, join);
}
} }
return _joins.get(key); return _joins.get(key);
} }
public void flushJoinsInvolvingProject(long projectID) { public void flushJoinsInvolvingProject(long projectID) {
for (Entry<String, ProjectJoin> entry : _joins.entrySet()) { synchronized (_joins) {
ProjectJoin join = entry.getValue(); for (Entry<String, ProjectJoin> entry : _joins.entrySet()) {
if (join.fromProjectID == projectID || join.toProjectID == projectID) { ProjectJoin join = entry.getValue();
_joins.remove(entry.getKey()); if (join.fromProjectID == projectID || join.toProjectID == projectID) {
_joins.remove(entry.getKey());
}
} }
} }
} }
public void flushJoinsInvolvingProjectColumn(long projectID, String columnName) { public void flushJoinsInvolvingProjectColumn(long projectID, String columnName) {
for (Entry<String, ProjectJoin> entry : _joins.entrySet()) { synchronized (_joins) {
ProjectJoin join = entry.getValue(); for (Entry<String, ProjectJoin> entry : _joins.entrySet()) {
if (join.fromProjectID == projectID && join.fromProjectColumnName.equals(columnName) || ProjectJoin join = entry.getValue();
join.toProjectID == projectID && join.toProjectColumnName.equals(columnName)) { if (join.fromProjectID == projectID && join.fromProjectColumnName.equals(columnName) ||
_joins.remove(entry.getKey()); join.toProjectID == projectID && join.toProjectColumnName.equals(columnName)) {
_joins.remove(entry.getKey());
}
} }
} }
} }