Repository: tajo Updated Branches: refs/heads/master 7c5ef87f6 -> 0e4362744
TAJO-1017: TajoConf misuses read & write locks in some functions. (Mai Hai Thanh via hyunsik) Closes #130 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/0e436274 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/0e436274 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/0e436274 Branch: refs/heads/master Commit: 0e43627440e034b28f85fd91fb5b0286e23a0299 Parents: 7c5ef87 Author: Hyunsik Choi <[email protected]> Authored: Thu Sep 4 15:25:41 2014 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Thu Sep 4 15:25:41 2014 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/0e436274/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 54d71c0..707fb38 100644 --- a/CHANGES +++ b/CHANGES @@ -130,6 +130,9 @@ Release 0.9.0 - unreleased BUG FIXES + TAJO-1017: TajoConf misuses read & write locks in some functions. + (Mai Hai Thanh via hyunsik) + TAJO-1020: TajoContainerProxy::assignExecutionBlock causes NPE by race. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/0e436274/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java index 178d80e..9aead24 100644 --- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java +++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java @@ -91,13 +91,13 @@ public class TajoConf extends Configuration { } public static TimeZone setCurrentTimeZone(TimeZone timeZone) { - readLock.lock(); + writeLock.lock(); try { TimeZone oldTimeZone = CURRENT_TIMEZONE; CURRENT_TIMEZONE = timeZone; return oldTimeZone; } finally { - readLock.unlock(); + writeLock.unlock(); } } @@ -124,13 +124,13 @@ public class TajoConf extends Configuration { } public static int setDateOrder(int dateOrder) { - readLock.lock(); + writeLock.lock(); try { int oldDateOrder = DATE_ORDER; DATE_ORDER = dateOrder; return oldDateOrder; } finally { - readLock.unlock(); + writeLock.unlock(); } }
