aboutsummaryrefslogtreecommitdiff
path: root/impl_core/src
diff options
context:
space:
mode:
authorKristen Kozak <sebright@google.com>2018-05-02 18:33:52 -0700
committerKristen Kozak <sebright@google.com>2018-05-02 18:33:52 -0700
commitc917cc24c7912bd3ef24da3a526f7c91bdafe33c (patch)
tree7425a8718720d2ff5677070d2c53c1b7ed565035 /impl_core/src
parent3838c4c4b150fad4e10671c9e37f36c894a9c535 (diff)
downloadopencensus-java-c917cc24c7912bd3ef24da3a526f7c91bdafe33c.tar.gz
Checker Framework: 2.5.0 -> 2.5.1
2.5.1 includes a fix for https://github.com/typetools/checker-framework/issues/1838. This commit also adds a few more @Nullable annotations that are required now.
Diffstat (limited to 'impl_core/src')
-rw-r--r--impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
index f4136616..8e527dc6 100644
--- a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
+++ b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
@@ -227,7 +227,7 @@ abstract class MutableViewData {
// If Stats state is DISABLED, return an empty ViewData.
return ViewData.create(
super.view,
- Collections.<List<TagValue>, AggregationData>emptyMap(),
+ Collections.<List</*@Nullable*/ TagValue>, AggregationData>emptyMap(),
ViewData.AggregationWindowData.CumulativeData.create(ZERO_TIMESTAMP, ZERO_TIMESTAMP));
}
}
@@ -320,7 +320,7 @@ abstract class MutableViewData {
// If Stats state is DISABLED, return an empty ViewData.
return ViewData.create(
super.view,
- Collections.<List<TagValue>, AggregationData>emptyMap(),
+ Collections.<List</*@Nullable*/ TagValue>, AggregationData>emptyMap(),
ViewData.AggregationWindowData.IntervalData.create(ZERO_TIMESTAMP));
}
}