Skip to content

Properly propagate exceptions type from server client. #150

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

Merged
merged 1 commit into from
Jul 15, 2016
Merged

Properly propagate exceptions type from server client. #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion reactivesocket-core/src/main/java/io/reactivesocket/exceptions/TransportException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ public TransportException(Throwable t) {
public synchronized Throwable fillInStackTrace() {
return this;
}

}
6 changes: 2 additions & 4 deletions reactivesocket-core/src/main/java/io/reactivesocket/internal/Requester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.reactivesocket.internal;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
Expand Down Expand Up @@ -837,9 +836,8 @@ public void onNext(Frame frame) {
cancel();
} else if (type == FrameType.ERROR) {
terminated.set(true);
final ByteBuffer byteBuffer = frame.getData();
String errorMessage = getByteBufferAsString(byteBuffer);
onError(new RuntimeException(errorMessage));
Throwable throwable = Exceptions.from(frame);
onError(throwable);
cancel();
} else {
onError(new RuntimeException("Unexpected FrameType: " + frame.getType()));
Expand Down
3 changes: 2 additions & 1 deletion reactivesocket-core/src/test/java/io/reactivesocket/LeaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.reactivesocket;

import io.reactivesocket.exceptions.RejectedException;
import io.reactivesocket.internal.Publishers;
import io.reactivesocket.internal.Responder;
import org.junit.After;
Expand Down Expand Up @@ -182,7 +183,7 @@ public void testWriteWithoutLease() throws InterruptedException {
TestSubscriber<Payload> ts2 = new TestSubscriber<>();
response2.subscribe(ts2);
ts2.awaitTerminalEvent(500, TimeUnit.MILLISECONDS);
ts2.assertError(RuntimeException.class);
ts2.assertError(RejectedException.class);
}

@Test(timeout=2000)
Expand Down
5 changes: 3 additions & 2 deletions reactivesocket-core/src/test/java/io/reactivesocket/internal/RequesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import io.reactivesocket.LatchedCompletable;
import io.reactivesocket.Payload;
import io.reactivesocket.TestConnection;
import io.reactivesocket.exceptions.InvalidRequestException;
import io.reactivesocket.util.PayloadImpl;
import io.reactivex.Observable;
import io.reactivex.subjects.ReplaySubject;
Expand Down Expand Up @@ -165,7 +166,7 @@ public void testRequestResponseError() throws InterruptedException {

conn.toInput.send(Frame.Error.from(2, new RuntimeException("Failed")));
ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS);
ts.assertError(Exception.class);
ts.assertError(InvalidRequestException.class);
assertEquals("Failed", ts.errors().get(0).getMessage());
}

Expand Down Expand Up @@ -313,7 +314,7 @@ public void testRequestStreamError() throws InterruptedException {
conn.toInput.send(utf8EncodedErrorFrame(2, "Failure"));

ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS);
ts.assertError(Exception.class);
ts.assertError(InvalidRequestException.class);
ts.assertValue(utf8EncodedPayload("hello", null));
assertEquals("Failure", ts.errors().get(0).getMessage());
}
Expand Down