diff options
| author |  ajmichael <ajmichael@google.com> | 2017-04-24 22:41:54 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-25 14:46:02 +0200 |
| commit | d9fea57268ff01c001fbcbdc2bd057c86c362e6f (patch) | |
| tree | 7ac36c65595696c01f354be028957811868bda06 /src/main/java/com/google/devtools/build/lib/buildeventstream/transports | |
| parent | 2968bcf12b222cd742db2740491329738dc9ed98 (diff) | |
Automated g4 rollback of commit 3d596d63f883fff56001ed7b2e5cf51dba45f082.
*** Reason for rollback ***
Made BuildEventStreamerTest#testSimpleStream 3% flaky based on --runs_per_test=1000.
RELNOTES: None
PiperOrigin-RevId: 154090559
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildeventstream/transports')
3 files changed, 2 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java index 6173e9febc..9de20b7175 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BinaryFormatFileTransport.java @@ -44,11 +44,6 @@ public final class BinaryFormatFileTransport extends FileTransport { } @Override - public String name() { - return this.getClass().getSimpleName(); - } - - @Override public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) { BuildEventConverters converters = new BuildEventConverters() { diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java index 3482cadd4b..6744df3ef6 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/FileTransport.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import com.google.common.annotations.VisibleForTesting; -import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.google.devtools.build.lib.buildeventstream.BuildEvent; import com.google.devtools.build.lib.buildeventstream.BuildEventTransport; @@ -28,6 +27,7 @@ import java.nio.channels.AsynchronousFileChannel; import java.nio.channels.CompletionHandler; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; @@ -87,7 +87,7 @@ abstract class FileTransport implements BuildEventTransport { } @Override - public synchronized ListenableFuture<Void> close() { + public synchronized Future<Void> close() { if (closing()) { return closeFuture; } diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java index dc7c2ade65..cf892955a7 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/TextFormatFileTransport.java @@ -38,11 +38,6 @@ public final class TextFormatFileTransport extends FileTransport { } @Override - public String name() { - return this.getClass().getSimpleName(); - } - - @Override public synchronized void sendBuildEvent(BuildEvent event, final ArtifactGroupNamer namer) { BuildEventConverters converters = new BuildEventConverters() { |