diff options
| author |  lberki <lberki@google.com> | 2017-09-05 16:01:44 +0200 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-09-06 10:09:53 +0200 |
| commit | 0d8d4cf53963a7b870596a8daac85f32a2d51d69 (patch) | |
| tree | ed60453947924c466854cdc217f949d49cfefb88 /src/main/java/com/google/devtools/build/lib/query2 | |
| parent | 3dd5683e84a2e37852d2aaf820116eead59abad5 (diff) | |
Fix assorted ErrorProne warnings.
RELNOTES: None.
PiperOrigin-RevId: 167574104
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/query2')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/output/GraphOutputFormatter.java | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java b/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java index 86bf39f9fa..14d1fdafdd 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java +++ b/src/main/java/com/google/devtools/build/lib/query2/LabelVisitor.java @@ -307,8 +307,8 @@ final class LabelVisitor { // Avoid thread-related overhead when not crossing packages. // Can start a new thread when count reaches 100, to prevent infinite recursion. - if (from != null && from.getLabel().getPackageFragment() == label.getPackageFragment() && - !blockNewActions() && count < RECURSION_LIMIT) { + if (from != null && from.getLabel().getPackageFragment().equals(label.getPackageFragment()) + && !blockNewActions() && count < RECURSION_LIMIT) { newVisitRunnable(from, attr, label, depth, count + 1).run(); } else { execute(newVisitRunnable(from, attr, label, depth, 0)); diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/GraphOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/GraphOutputFormatter.java index 869901f894..9640dd6067 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/GraphOutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/GraphOutputFormatter.java @@ -24,7 +24,9 @@ import com.google.devtools.build.lib.graph.Node; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.query2.output.QueryOptions.OrderOutput; import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -53,9 +55,11 @@ class GraphOutputFormatter extends OutputFormatter { boolean sortLabels = options.orderOutput == OrderOutput.FULL; if (options.graphFactored) { - outputFactored(result, new PrintWriter(out), sortLabels); + outputFactored(result, new PrintWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8)), + sortLabels); } else { - outputUnfactored(result, new PrintWriter(out), sortLabels, options); + outputUnfactored(result, new PrintWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8)), + sortLabels, options); } } @@ -157,6 +161,7 @@ class GraphOutputFormatter extends OutputFormatter { * * TODO(bazel-team): Make this a method of Digraph. */ + @SuppressWarnings("ReferenceEquality") private static <LABEL> EquivalenceRelation<Node<LABEL>> createEquivalenceRelation() { return new EquivalenceRelation<Node<LABEL>>() { @Override |