cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1399 from open-keychain/thread-cleanup

Browse Source 
Kill search threads that have not returned
This commit is contained in:
Dominik Schürmann
2015-07-02 00:52:12 +02:00
parent 39c752727e f44f966dc8
commit 9fe05ed1e7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java
View File

@@ -45,6 +45,7 @@ public class CloudSearch {
} }
final ImportKeysList results = new ImportKeysList(servers.size()); final ImportKeysList results = new ImportKeysList(servers.size());
ArrayList<Thread> searchThreads = new ArrayList<>();
for (final Keyserver keyserver : servers) { for (final Keyserver keyserver : servers) {
Runnable r = new Runnable() { Runnable r = new Runnable() {
@Override @Override
@@ -57,19 +58,25 @@ public class CloudSearch {
results.finishedAdding(); // notifies if all searchers done results.finishedAdding(); // notifies if all searchers done
} }
}; };
new Thread(r).start(); Thread searchThread = new Thread(r);
searchThreads.add(searchThread);
searchThread.start();
} }
// wait for either all the searches to come back, or 10 seconds // wait for either all the searches to come back, or 10 seconds
synchronized(results) { synchronized (results) {
try { try {
results.wait(10 * SECONDS); results.wait(10 * SECONDS);
for (Thread thread : searchThreads) {
// kill threads that haven't returned yet
thread.interrupt();
}
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }
} }
if (results.outstandingSuppliers() > 0) { if (results.outstandingSuppliers() > 0) {
String message = "Launched " + servers.size() + " cloud searchers, but" + String message = "Launched " + servers.size() + " cloud searchers, but" +
results.outstandingSuppliers() + "failed to complete."; results.outstandingSuppliers() + "failed to complete.";
problems.add(new Keyserver.QueryFailedException(message)); problems.add(new Keyserver.QueryFailedException(message));
} }