| commit | 97530fb916fe17560e7cb7c810283e550531484f | [log] [tgz] |
|---|---|---|
| author | Masatake Iwasaki <iwasakims@apache.org> | Thu Jan 29 16:05:10 2015 -0800 |
| committer | Masatake Iwasaki <iwasakims@apache.org> | Thu Jan 29 16:05:10 2015 -0800 |
| tree | aeb9031d577c2755b70d6e7d7d705b4ff210533c | |
| parent | e011fd01ea161c9e3185886bb14d8c3abd7646a6 [diff] |
HTRACE-93. Add null check to SamplerBuilder (iwasakims)
diff --git a/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java b/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java index 5d90e48..ed7e9b6 100644 --- a/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java +++ b/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java
@@ -45,7 +45,7 @@ public Sampler build() { String str = conf.get(SAMPLER_CONF_KEY); - if (str.isEmpty()) { + if (str == null || str.isEmpty()) { return NeverSampler.INSTANCE; } if (!str.contains(".")) {
diff --git a/htrace-core/src/test/java/org/apache/htrace/TestSampler.java b/htrace-core/src/test/java/org/apache/htrace/TestSampler.java index 31060d4..0cc7d97 100644 --- a/htrace-core/src/test/java/org/apache/htrace/TestSampler.java +++ b/htrace-core/src/test/java/org/apache/htrace/TestSampler.java
@@ -44,6 +44,11 @@ fromKeyValuePairs("sampler", "NonExistentSampler")). build(); Assert.assertEquals(NeverSampler.class, neverSampler2.getClass()); + + Sampler neverSampler3 = new SamplerBuilder(HTraceConfiguration. + fromKeyValuePairs("sampler.is.not.defined", "NonExistentSampler")). + build(); + Assert.assertEquals(NeverSampler.class, neverSampler3.getClass()); } @Test