Swiftdiff options
| author | Tarun Gupta <tarun1995gupta@gmail.com> | 2015-07-17 02:22:32 (GMT) |
|---|---|---|
| committer | Nick Hudson <nick.hudson@isode.com> | 2015-07-28 13:14:20 (GMT) |
| commit | 673655830b0325d964e67fa835ea83f485e9beeb (patch) | |
| tree | 27e4f8bd20dd9011207641a83212ced393fbada2 /src/com/isode/stroke/network/JavaConnection.java | |
| parent | 6f84f6a65b8b80e2f599dff76da0cd13fbead611 (diff) | |
| download | stroke-673655830b0325d964e67fa835ea83f485e9beeb.zip stroke-673655830b0325d964e67fa835ea83f485e9beeb.tar.bz2 | |
Complete StreamStack and add tests.
TLSLayer could not be updated because it requires TLS to be ported first.
Updates other classes, only for having compatibility with SafeByteArray because of updates in Stream Stack.
License:
This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Test-Information:
Tests added for StreamStack and XMPPLayer, which passes.
Change-Id: I8707fc1f16d622d2a90f6f39f671b7e7c46aa170
Diffstat (limited to 'src/com/isode/stroke/network/JavaConnection.java')
| -rw-r--r-- | src/com/isode/stroke/network/JavaConnection.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/isode/stroke/network/JavaConnection.java b/src/com/isode/stroke/network/JavaConnection.java index 4e7503b..66f068f 100644 --- a/src/com/isode/stroke/network/JavaConnection.java +++ b/src/com/isode/stroke/network/JavaConnection.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.List; import com.isode.stroke.base.ByteArray; +import com.isode.stroke.base.SafeByteArray; import com.isode.stroke.eventloop.Event.Callback; import com.isode.stroke.eventloop.EventLoop; import com.isode.stroke.eventloop.EventOwner; @@ -30,16 +31,16 @@ public class JavaConnection extends Connection implements EventOwner { * got closed. */ private static class ReadResult { - public ByteArray dataRead_; + public SafeByteArray dataRead_; public boolean socketClosed_; ReadResult(boolean socketClosed) { - dataRead_ = new ByteArray(); + dataRead_ = new SafeByteArray(); socketClosed_ = socketClosed; } ReadResult(ByteArrayOutputStream byteArrayOutputStream, boolean socketClosed) { - dataRead_ = new ByteArray(byteArrayOutputStream.toByteArray()); + dataRead_ = new SafeByteArray(byteArrayOutputStream.toByteArray()); socketClosed_ = socketClosed; } } @@ -95,7 +96,7 @@ public class JavaConnection extends Connection implements EventOwner { } { /* Handle any reading */ - ByteArray dataRead; + SafeByteArray dataRead; if (readNeeded) { ReadResult rr = doRead(); @@ -299,7 +300,7 @@ public class JavaConnection extends Connection implements EventOwner { } } - private void handleDataRead(final ByteArray data) { + private void handleDataRead(final SafeByteArray data) { if (synchroniseReads_) { selectionKey_.interestOps(0); } @@ -372,7 +373,7 @@ public class JavaConnection extends Connection implements EventOwner { } @Override - public void write(ByteArray data) { + public void write(SafeByteArray data) { worker_.writeBuffer_.add(data.getData()); // Check "isOpen" to Avoid Android crash see // https://code.google.com/p/android/issues/detail?id=80785 |