From: Owen S. Dunn <osd1000@tacitus.greenend.org.uk>
Date: Tue, 22 Dec 2009 14:17:51 +0000 (+0000)
Subject: Fix latch bug.
X-Git-Tag: 0.9.1~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=615a2587009b0e237aeafc0313cfe6cf76aa69c3;p=jarrg-ian.git

Fix latch bug.
---

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 756dec3..4886868 100644
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -305,7 +305,6 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
 		Accessible leagueTracker = descendNodes(window,new int[] {0,1,0,0,2,1,1,1});
 		try {
-		        latch = new java.util.concurrent.CountDownLatch(0);
 			islandName = ((JLabel)leagueTracker).getToolTipText();
 		} catch (NullPointerException e) {
 			
@@ -390,7 +389,9 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 	        getIsland();
 		getOcean();
 
-		latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
+		if (latch != null) {
+		    latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
+		}
 
 		ArrayList<ArrayList<String>> data = getData(t);