From 2b73500e56675a0c1bfb8261770d52515223ea98 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sat, 20 Jun 2009 01:43:41 +0000
Subject: Synchronize charset changing

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@320 df292f66-193f-0410-a5fc-6d59da041ff2
---
 src/org/connectbot/service/Relay.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/org')

diff --git a/src/org/connectbot/service/Relay.java b/src/org/connectbot/service/Relay.java
index c15f3f4..cd1c227 100644
--- a/src/org/connectbot/service/Relay.java
+++ b/src/org/connectbot/service/Relay.java
@@ -78,7 +78,9 @@ public class Relay implements Runnable {
 		newCd.onMalformedInput(CodingErrorAction.REPLACE);
 
 		currentCharset = charset;
-		decoder = newCd;
+		synchronized (this) {
+			decoder = newCd;
+		}
 	}
 
 	public void run() {
@@ -97,7 +99,9 @@ public class Relay implements Runnable {
 				if (bytesRead > 0) {
 					byteBuffer.position(0);
 					byteBuffer.limit(bytesRead);
-					decoder.decode(byteBuffer, charBuffer, false);
+					synchronized (this) {
+						decoder.decode(byteBuffer, charBuffer, false);
+					}
 					buffer.putString(charArray, 0, charBuffer.position());
 					charBuffer.clear();
 					bridge.redraw();
-- 
cgit v1.2.3