Repository: tajo Updated Branches: refs/heads/branch-0.11.1 8ead4bf7e -> 0b32c1baf
TAJO-1578: User configuration for pull server port is ignored. Signed-off-by: Jihoon Son <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/0b32c1ba Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/0b32c1ba Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/0b32c1ba Branch: refs/heads/branch-0.11.1 Commit: 0b32c1baf2fc901e7185a6cbb9686b35bc56a663 Parents: 8ead4bf Author: Dongkyu Hwangbo <[email protected]> Authored: Mon Nov 2 18:47:42 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Nov 2 18:47:42 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../java/org/apache/tajo/pullserver/TajoPullServerService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/0b32c1ba/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 5f3640a..fa389b5 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,9 @@ Release 0.11.1 - unreleased BUG FIXES + TAJO-1578: User configuration for pull server port is ignored. + (Contributed by Dongkyu Hwangbo, committed by jihoon) + TAJO-1954: Fix memory leak in physical operator. (jinho) TAJO-1643: SQLParse can't parse parentheses table clause. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/0b32c1ba/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java ---------------------------------------------------------------------- diff --git a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java index d6f5a90..6a9deb5 100644 --- a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java +++ b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java @@ -195,7 +195,7 @@ public class TajoPullServerService extends AbstractService { localFS = new LocalFileSystem(); conf.setInt(TajoConf.ConfVars.PULLSERVER_PORT.varname - , TajoConf.ConfVars.PULLSERVER_PORT.defaultIntVal); + , conf.getInt(TajoConf.ConfVars.PULLSERVER_PORT.varname, TajoConf.ConfVars.PULLSERVER_PORT.defaultIntVal)); super.init(conf); LOG.info("Tajo PullServer initialized: readaheadLength=" + readaheadLength); } catch (Throwable t) {
