yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 10:19:33 +02:00
Code Issues Releases Wiki Activity

fixed concurrent modification problem

Browse source
This commit is contained in:
Nikolay Pultsin 2011-04-17 00:10:09 +01:00
parent 0fc36c00ec
commit 1c0251070f
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/org/geometerplus/fbreader/network/NetworkLibrary.java
View file

@ -89,8 +89,10 @@ public class NetworkLibrary {
public List<String> languageCodes() { public List<String> languageCodes() {
final TreeSet<String> languageSet = new TreeSet<String>(); final TreeSet<String> languageSet = new TreeSet<String>();
for (INetworkLink link : myLinks) { synchronized (myLinks) {
languageSet.add(link.getLanguage()); for (INetworkLink link : myLinks) {
languageSet.add(link.getLanguage());
}
} }
return new ArrayList<String>(languageSet); return new ArrayList<String>(languageSet);
} }
@ -245,7 +247,11 @@ public class NetworkLibrary {
} }
} }
} }
for (INetworkLink link : myLinks) { final List<INetworkLink> linksCopy;
synchronized (myLinks) {
linksCopy = new ArrayList<INetworkLink>(myLinks);
}
for (INetworkLink link : linksCopy) {
if (link instanceof ICustomNetworkLink) { if (link instanceof ICustomNetworkLink) {
final ICustomNetworkLink customLink = (ICustomNetworkLink)link; final ICustomNetworkLink customLink = (ICustomNetworkLink)link;
if (customLink.isObsolete(12 * 60 * 60 * 1000)) { // 12 hours if (customLink.isObsolete(12 * 60 * 60 * 1000)) { // 12 hours
@ -483,12 +489,14 @@ public class NetworkLibrary {
if (id == ICustomNetworkLink.INVALID_ID) { if (id == ICustomNetworkLink.INVALID_ID) {
addLinkInternal(link); addLinkInternal(link);
} else { } else {
for (int i = myLinks.size() - 1; i >= 0; --i) { synchronized (myLinks) {
final INetworkLink l = myLinks.get(i); for (int i = myLinks.size() - 1; i >= 0; --i) {
if (l instanceof ICustomNetworkLink && final INetworkLink l = myLinks.get(i);
((ICustomNetworkLink)l).getId() == id) { if (l instanceof ICustomNetworkLink &&
myLinks.set(i, link); ((ICustomNetworkLink)l).getId() == id) {
break; myLinks.set(i, link);
break;
}
} }
} }
} }