X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fstartup%2FConcurrentComponentPresetDatabaseLoader.java;h=2e57fa5cff4771fa68218a0a05eca79b57032ef3;hb=e21b77118f72c9c82ef379b3d044f042371f6d04;hp=cc16ddc73bc4b81e9ba121838eb111b66ae90a17;hpb=bbdd01e3f680d5c22b6dae29220d191fd8fc7163;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java b/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
index cc16ddc7..2e57fa5c 100644
--- a/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
+++ b/core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
@@ -49,7 +49,7 @@ public class ConcurrentComponentPresetDatabaseLoader {
 			}
 		});
 
-		loaderPool = Executors.newFixedThreadPool(15, new ThreadFactory() {
+		loaderPool = Executors.newFixedThreadPool(3, new ThreadFactory() {
 			int threadCount = 0;
 			@Override
 			public Thread newThread(Runnable r) {
@@ -70,9 +70,9 @@ public class ConcurrentComponentPresetDatabaseLoader {
 	public void await() throws InterruptedException {
 		latch.await();
 		loaderPool.shutdown();
-		loaderPool.awaitTermination(30, TimeUnit.SECONDS);
+		loaderPool.awaitTermination(90, TimeUnit.SECONDS);
 		writerPool.shutdown();
-		writerPool.awaitTermination(30, TimeUnit.SECONDS);
+		writerPool.awaitTermination(90, TimeUnit.SECONDS);
 		iterator.close();
 		long end = System.currentTimeMillis();
 		log.debug("Time to load presets: " + (end-startTime) + "ms " + presetCount + " loaded from " + fileCount + " files");