From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Tue, 10 Jul 2012 03:41:58 +0000 (+0000)
Subject: Bump out the timeouts on the Preset loader so it doesn't complain when running with... 
X-Git-Tag: upstream/12.09^2~122
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=30b032e10e63722fa132b5bea6c7866e3896fb5c;hp=60711b784f4f3f331f49e28a7e2af3fa2a5b8644;p=debian%2Fopenrocket

Bump out the timeouts on the Preset loader so it doesn't complain when running with debugging output enabled.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@877 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java b/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
index a4191da3..cc16ddc7 100644
--- a/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
+++ b/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
@@ -70,9 +70,9 @@ public class ConcurrentComponentPresetDatabaseLoader {
 	public void await() throws InterruptedException {
 		latch.await();
 		loaderPool.shutdown();
-		loaderPool.awaitTermination(10, TimeUnit.SECONDS);
+		loaderPool.awaitTermination(30, TimeUnit.SECONDS);
 		writerPool.shutdown();
-		writerPool.awaitTermination(10, TimeUnit.SECONDS);
+		writerPool.awaitTermination(30, TimeUnit.SECONDS);
 		iterator.close();
 		long end = System.currentTimeMillis();
 		log.debug("Time to load presets: " + (end-startTime) + "ms " + presetCount + " loaded from " + fileCount + " files");