From 5e01cea1ef3d1ece5ff5a17e28a3328f8d544a35 Mon Sep 17 00:00:00 2001 From: ejona Date: Wed, 11 Jun 2014 16:24:43 -0700 Subject: [PATCH] Change newtransport to use c.g.n.stubby.Status. c.g.n.stubby.Transport.Status isn't intended to be used (at least at this point). ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=69027874 --- core/src/main/java/com/google/net/stubby/ChannelImpl.java | 5 ++--- .../com/google/net/stubby/newtransport/ServerStream.java | 2 +- .../com/google/net/stubby/newtransport/StreamListener.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/google/net/stubby/ChannelImpl.java b/core/src/main/java/com/google/net/stubby/ChannelImpl.java index ca1f2d7bc7..acf48615e7 100644 --- a/core/src/main/java/com/google/net/stubby/ChannelImpl.java +++ b/core/src/main/java/com/google/net/stubby/ChannelImpl.java @@ -11,7 +11,6 @@ import com.google.net.stubby.newtransport.ClientStream; import com.google.net.stubby.newtransport.ClientTransport; import com.google.net.stubby.newtransport.ClientTransportFactory; import com.google.net.stubby.newtransport.StreamListener; -import com.google.net.stubby.transport.Transport; import java.io.InputStream; import java.io.IOException; @@ -248,7 +247,7 @@ public final class ChannelImpl extends AbstractService implements Channel { } @Override - public void closed(final Transport.Status status) { + public void closed(final Status status) { for (SettableFuture future : inProcessFutures) { future.cancel(false); } @@ -256,7 +255,7 @@ public final class ChannelImpl extends AbstractService implements Channel { executor.execute(new Runnable() { @Override public void run() { - observer.onClose(new com.google.net.stubby.Status(status.getCode())); + observer.onClose(status); } }); } diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java b/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java index bf8a723abd..2ebb239f24 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java +++ b/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java @@ -1,6 +1,6 @@ package com.google.net.stubby.newtransport; -import com.google.net.stubby.transport.Transport.Status; +import com.google.net.stubby.Status; /** diff --git a/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java b/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java index 5564829926..1efc441fca 100644 --- a/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java +++ b/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java @@ -1,7 +1,7 @@ package com.google.net.stubby.newtransport; import com.google.common.util.concurrent.ListenableFuture; -import com.google.net.stubby.transport.Transport.Status; +import com.google.net.stubby.Status; import java.io.InputStream;