From 90632bd675a923e3ae22873547a5a936e485bd3f Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 13 Mar 2010 06:24:31 +0000
Subject: Fix PromptHelper race condition

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@489 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml                          | 2 +-
 src/org/connectbot/service/PromptHelper.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4de2157..0b62304 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.7-dev"
-	android:versionCode="260">
+	android:versionCode="261">
 
 	<application
 		android:icon="@drawable/icon"
diff --git a/src/org/connectbot/service/PromptHelper.java b/src/org/connectbot/service/PromptHelper.java
index 41082c7..f0a37be 100644
--- a/src/org/connectbot/service/PromptHelper.java
+++ b/src/org/connectbot/service/PromptHelper.java
@@ -66,6 +66,9 @@ public class PromptHelper {
 	 */
 	public void setResponse(Object value) {
 		response = value;
+		promptRequested = null;
+		promptInstructions = null;
+		promptHint = null;
 		promptResponse.release();
 	}
 
@@ -101,9 +104,6 @@ public class PromptHelper {
 
 			// acquire lock until user passes back value
 			promptResponse.acquire();
-			promptInstructions = null;
-			promptHint = null;
-			promptRequested = null;
 
 			response = popResponse();
 		} finally {
-- 
cgit v1.2.3