You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by iw...@apache.org on 2015/01/30 01:06:01 UTC
incubator-htrace git commit: HTRACE-93. Add null check to
SamplerBuilder (iwasakims)
Repository: incubator-htrace
Updated Branches:
refs/heads/master e011fd01e -> 97530fb91
HTRACE-93. Add null check to SamplerBuilder (iwasakims)
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/97530fb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/97530fb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/97530fb9
Branch: refs/heads/master
Commit: 97530fb916fe17560e7cb7c810283e550531484f
Parents: e011fd0
Author: Masatake Iwasaki <iw...@apache.org>
Authored: Thu Jan 29 16:05:10 2015 -0800
Committer: Masatake Iwasaki <iw...@apache.org>
Committed: Thu Jan 29 16:05:10 2015 -0800
----------------------------------------------------------------------
htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java | 2 +-
htrace-core/src/test/java/org/apache/htrace/TestSampler.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/97530fb9/htrace-core/src/main/java/org/apache/htrace/SamplerBuilder.java
----------------------------------------------------------------------
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 class SamplerBuilder {
public Sampler build() {
String str = conf.get(SAMPLER_CONF_KEY);
- if (str.isEmpty()) {
+ if (str == null || str.isEmpty()) {
return NeverSampler.INSTANCE;
}
if (!str.contains(".")) {
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/97530fb9/htrace-core/src/test/java/org/apache/htrace/TestSampler.java
----------------------------------------------------------------------
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 @@ public class TestSampler {
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