From 18c3333271541a63d3ce626601661b7fc9bb7f53 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 14 Apr 2014 20:35:11 +0200 Subject: tried to fix some race conditions. not adding duplicate candidates. needs more checks though --- src/eu/siacs/conversations/xmpp/jingle/SocksConnection.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/eu/siacs/conversations/xmpp/jingle/SocksConnection.java') diff --git a/src/eu/siacs/conversations/xmpp/jingle/SocksConnection.java b/src/eu/siacs/conversations/xmpp/jingle/SocksConnection.java index bf7c87ad8..cfa24d505 100644 --- a/src/eu/siacs/conversations/xmpp/jingle/SocksConnection.java +++ b/src/eu/siacs/conversations/xmpp/jingle/SocksConnection.java @@ -160,9 +160,13 @@ public class SocksConnection { count = (int) remainingSize; } count = inputStream.read(buffer, 0, count); - fileOutputStream.write(buffer, 0, count); - digest.update(buffer, 0, count); - remainingSize-=count; + if (count==-1) { + Log.d("xmppService","end of stream"); + } else { + fileOutputStream.write(buffer, 0, count); + digest.update(buffer, 0, count); + remainingSize-=count; + } } fileOutputStream.flush(); fileOutputStream.close(); -- cgit v1.2.3