diff options
| author | Kristen Kozak <sebright@google.com> | 2017-12-19 17:19:32 -0800 |
|---|---|---|
| committer | Kristen Kozak <sebright@google.com> | 2017-12-19 17:20:38 -0800 |
| commit | 6fb84f495a4862cd2dc510609daa7400b58d2037 (patch) | |
| tree | e8a4377a8f02dcc5b7d5944874690e364691a3bd /api/src | |
| parent | dad6b90e7979fcbc3fd3bf61f1561faeb07ca8b6 (diff) | |
| download | platform_external_opencensus-java-6fb84f495a4862cd2dc510609daa7400b58d2037.tar.gz platform_external_opencensus-java-6fb84f495a4862cd2dc510609daa7400b58d2037.tar.bz2 platform_external_opencensus-java-6fb84f495a4862cd2dc510609daa7400b58d2037.zip | |
Add missing null checks (issue #359).
Diffstat (limited to 'api/src')
| -rw-r--r-- | api/src/main/java/io/opencensus/trace/samplers/ProbabilitySampler.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/api/src/main/java/io/opencensus/trace/samplers/ProbabilitySampler.java b/api/src/main/java/io/opencensus/trace/samplers/ProbabilitySampler.java index d6247344..21d4d6ca 100644 --- a/api/src/main/java/io/opencensus/trace/samplers/ProbabilitySampler.java +++ b/api/src/main/java/io/opencensus/trace/samplers/ProbabilitySampler.java @@ -83,10 +83,12 @@ abstract class ProbabilitySampler extends Sampler { if (parentContext != null && parentContext.getTraceOptions().isSampled()) { return true; } - // If any parent link is sampled keep the sampling decision. - for (Span parentLink : parentLinks) { - if (parentLink.getContext().getTraceOptions().isSampled()) { - return true; + if (parentLinks != null) { + // If any parent link is sampled keep the sampling decision. + for (Span parentLink : parentLinks) { + if (parentLink.getContext().getTraceOptions().isSampled()) { + return true; + } } } // Always sample if we are within probability range. This is true even for child spans (that |