Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-26585] Android: Catch all TCP socket read and write exceptions #10490

Merged
merged 6 commits into from
Dec 19, 2018
Merged

[TIMOB-26585] Android: Catch all TCP socket read and write exceptions #10490

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44eff49
[TIMOB-26585] Catch all read and write exceptions
Nov 26, 2018
9903cb3
[TIMOB-26585] Fix formatting
Nov 26, 2018
2a7120f
Merge branch 'master' into TIMOB-26585
jquick-axway Nov 29, 2018
c9a4aa9
Merge branch 'master' into TIMOB-26585
garymathews Dec 17, 2018
4c16361
Merge branch 'master' into TIMOB-26585
garymathews Dec 19, 2018
c790408
Merge branch 'master' into TIMOB-26585
lokeshchdhry Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions android/modules/network/src/java/ti/modules/titanium/network/socket/TCPProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ public int readSync(Object bufferProxy, int offset, int length) throws IOExcepti
{
try {
return TiStreamHelper.read(clientSocket.getInputStream(), (BufferProxy) bufferProxy, offset, length);
} catch (IOException e) {
} catch (Exception e) {
e.printStackTrace();
String message = e.getMessage();
if (message == null) {
Expand Down Expand Up @@ -422,7 +422,7 @@ public int writeSync(Object buffer, int offset, int length) throws IOException
{
try {
return TiStreamHelper.write(clientSocket.getOutputStream(), (BufferProxy) buffer, offset, length);
} catch (IOException e) {
} catch (Exception e) {
e.printStackTrace();
String message = e.getMessage();
if (message == null) {
Expand Down Expand Up @@ -469,6 +469,17 @@ public void close() throws IOException
}
}

@Override
public void release()
{
try {
close();
} catch (Exception e) {
// do nothing...
}
super.release();
}

@Override
public String getApiName()
{
Expand Down