diff options
| author |  Miguel Alcon Pinto <malcon@google.com> | 2015-09-22 20:54:38 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2015-09-23 10:31:49 +0000 |
| commit | f5c5dcbea9a997c18918a450fd151c2525c355f4 (patch) | |
| tree | 362965642186e4ac5f90c3664447433c3e270fea /src/main | |
| parent | 8aaa2296a32d5051c1333efe8f2d313aaa9b5832 (diff) | |
Make aspect resolver and dependencyFilter transient, as they are not serializable.
--
MOS_MIGRATED_REVID=103678330
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java index 88aae47652..1fface3bb9 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java @@ -61,10 +61,11 @@ public class ProtoOutputFormatter extends OutputFormatter implements UnorderedFo */ public static final String RULE_IMPLEMENTATION_HASH_ATTR_NAME = "$rule_implementation_hash"; - private BinaryPredicate<Rule, Attribute> dependencyFilter; + private transient BinaryPredicate<Rule, Attribute> dependencyFilter; + protected transient AspectResolver aspectResolver; + private boolean relativeLocations = false; protected boolean includeDefaultValues = true; - protected AspectResolver aspectResolver; protected void setDependencyFilter(QueryOptions options) { this.dependencyFilter = OutputFormatter.getDependencyFilter(options); diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java index 9902b3f937..c0c47ba4a4 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/XmlOutputFormatter.java @@ -60,8 +60,8 @@ class XmlOutputFormatter extends AbstractUnorderedFormatter { private boolean xmlLineNumbers; private boolean showDefaultValues; private boolean relativeLocations; - private AspectResolver aspectResolver; - private BinaryPredicate<Rule, Attribute> dependencyFilter; + private transient AspectResolver aspectResolver; + private transient BinaryPredicate<Rule, Attribute> dependencyFilter; @Override public String getName() { |