From 59455697de323329295af8ea097580ab47b71a1f Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 25 Oct 2016 16:29:12 +1300
Subject: [PATCH] Added maximum timeout to await()

---
 .../fr/free/nrw/commons/category/CategorizationFragment.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
index 093984cbf..d8f5cef48 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
@@ -47,6 +47,7 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
@@ -151,7 +152,7 @@ public class CategorizationFragment extends Fragment {
 
         //Only return titleCatItems after API call has finished
         try {
-            mergeLatch.await();
+            mergeLatch.await(5L, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
             Log.e(TAG, "Interrupted exception: ", e);
         }
@@ -204,7 +205,7 @@ public class CategorizationFragment extends Fragment {
 
         //Await results of titleItems, which is likely to come in last
         try {
-            mergeLatch.await();
+            mergeLatch.await(5L, TimeUnit.SECONDS);
             Log.d(TAG, "Waited for merge");
         } catch (InterruptedException e) {
             Log.e(TAG, "Interrupted Exception: ", e);