From e8b4f6d66465aecb99ba0b3a9e8edd60880f65fb Mon Sep 17 00:00:00 2001
From: Mads Boddum <danish_cyborg@hotmail.com>
Date: Wed, 7 Oct 2015 22:32:16 +0200
Subject: [PATCH] The shuttle behaviour ExecutorService is now instantiated in
 initialize() instead of in TravelService's constructor

---
 src/services/galaxy/TravelService.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/services/galaxy/TravelService.java b/src/services/galaxy/TravelService.java
index 693a8190e..67ea9d6ad 100644
--- a/src/services/galaxy/TravelService.java
+++ b/src/services/galaxy/TravelService.java
@@ -92,7 +92,7 @@ public final class TravelService extends Service {
 	
 	// Fields relating to shuttle take-off and landing
 	private Posture currentShuttlePosture;
-	private final ExecutorService executor;
+	private ExecutorService executor;
 	private final int timeUntilLand;
 	private int timeRemaining;
 	private final long landDelay;
@@ -112,7 +112,6 @@ public final class TravelService extends Service {
 		travelFeeTable = (DatatableData) ClientFactory.getInfoFromFile("datatables/travel/travel.iff");
 		pointsOnPlanet = new HashMap<>();
 		
-		executor = Executors.newSingleThreadExecutor();
 		timeUntilLand = getConfig(ConfigFile.FEATURES).getInt("SHUTTLE-AWAY-TIME", 60);
 		timeRemaining = timeUntilLand;
 		shuttleLanded = true;	// Shuttles start off being grounded
@@ -131,6 +130,13 @@ public final class TravelService extends Service {
 		registerForIntent(ObjectCreatedIntent.TYPE);
 	}
 	
+	@Override
+	public boolean initialize() {
+		executor = Executors.newSingleThreadExecutor();
+		
+		return super.initialize();
+	}
+	
 	@Override
 	public boolean start() {
 		executor.execute(new ShuttleBehaviour());