diff options
author | Andy Shaw <andy.shaw@qt.io> | 2018-02-28 10:35:19 +0100 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2018-03-02 08:12:37 +0000 |
commit | ccdcf8c4f2f207e1f8468a6ae9ec505fb23e7296 (patch) | |
tree | aa8fc565dc066313f5446cfa911f880f235a710b /src/android | |
parent | d8b143d4b77c45cfe1a40d525be5d0a79a2b07a4 (diff) |
Android: Close the DataOutputStream when we are finished with it
Task-number: QTBUG-66769
Change-Id: I93c49baa0ccab4f853402d9be675af1c50b2e0c1
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/android')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 8 |
1 files changed, 7 insertions, 1 deletions
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) { } } } |