You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by te...@apache.org on 2014/06/21 01:38:24 UTC
git commit: SLIDER-154 HBASE_LOG_DIR shouldn't contain comma
Repository: incubator-slider
Updated Branches:
refs/heads/develop 5023eb56c -> 1a8062e3e
SLIDER-154 HBASE_LOG_DIR shouldn't contain comma
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1a8062e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1a8062e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1a8062e3
Branch: refs/heads/develop
Commit: 1a8062e3ec06c39d10b80f7adc764a7e2c155944
Parents: 5023eb5
Author: tedyu <yu...@gmail.com>
Authored: Fri Jun 20 16:38:27 2014 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Fri Jun 20 16:38:27 2014 -0700
----------------------------------------------------------------------
.../org/apache/slider/providers/hbase/HBaseProviderService.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1a8062e3/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
index 407f39a..5405753 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
+++ b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
@@ -127,13 +127,14 @@ public class HBaseProviderService extends AbstractProviderService implements
// Set the environment
launcher.putEnv(SliderUtils.buildEnvMap(appComponent));
- launcher.setEnv(HBASE_LOG_DIR, providerUtils.getLogdir());
+ String logDir = providerUtils.getLogdir();
+ int idx = logDir.indexOf(",");
+ launcher.setEnv(HBASE_LOG_DIR, idx > 0 ? logDir.substring(0, idx) : logDir);
launcher.setEnv(PROPAGATED_CONFDIR,
ProviderUtils.convertToAppRelativePath(
SliderKeys.PROPAGATED_CONF_DIR_NAME) );
-
//local resources
//add the configuration resources