Repository: tajo Updated Branches: refs/heads/master f4abd4e99 -> 4189f91d7
TAJO-1578: User configuration for pull server port is ignored. Closes #820 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/4189f91d Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4189f91d Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4189f91d Branch: refs/heads/master Commit: 4189f91d78e01d2a9524b44990093db4c435dc17 Parents: f4abd4e Author: Dongkyu Hwangbo <[email protected]> Authored: Mon Nov 2 18:45:49 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Nov 2 18:45:49 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/4189f91d/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d4f9180..4f5c63b 100644 --- a/CHANGES +++ b/CHANGES @@ -24,6 +24,9 @@ Release 0.12.0 - 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/4189f91d/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 2eaa3d2..4a4ae53 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) {
