From ccdcf8c4f2f207e1f8468a6ae9ec505fb23e7296 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 28 Feb 2018 10:35:19 +0100 Subject: Android: Close the DataOutputStream when we are finished with it Task-number: QTBUG-66769 Change-Id: I93c49baa0ccab4f853402d9be675af1c50b2e0c1 Reviewed-by: Christian Stromme --- .../jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 6b8577116e..fa7508921d 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -677,12 +677,13 @@ public class QtActivityDelegate final int timeOut = 30000; // ms until we give up on ping and pong final int maxAttempts = timeOut / napTime; + DataOutputStream outToClient = null; try { LocalSocket connectionFromClient = socket.accept(); debugLog("Debug socket accepted"); BufferedReader inFromClient = new BufferedReader(new InputStreamReader(connectionFromClient.getInputStream())); - DataOutputStream outToClient = new DataOutputStream(connectionFromClient.getOutputStream()); + outToClient = new DataOutputStream(connectionFromClient.getOutputStream()); outToClient.writeBytes("" + android.os.Process.myPid()); for (int i = 0; i < maxAttempts; i++) { @@ -704,6 +705,11 @@ public class QtActivityDelegate } catch (InterruptedException interruptEx) { wasFailure = true; Log.e(QtNative.QtTAG,"Can't start debugger" + interruptEx.getMessage()); + } finally { + try { + if (outToClient != null) + outToClient.close(); + } catch (IOException ignored) { } } } -- cgit v1.2.3