Repository: lens Updated Branches: refs/heads/master 0ea84729a -> 66ff2fd50
LENS-1456: Fix Deadlock in jdbcdriver Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/66ff2fd5 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/66ff2fd5 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/66ff2fd5 Branch: refs/heads/master Commit: 66ff2fd50140091083841558ed05db10b5565d7b Parents: 0ea8472 Author: Rajat Khandelwal <[email protected]> Authored: Fri Aug 11 15:52:48 2017 +0530 Committer: Rajat Khandelwal <[email protected]> Committed: Fri Aug 11 15:52:48 2017 +0530 ---------------------------------------------------------------------- .../java/org/apache/lens/server/api/query/QueryContext.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/66ff2fd5/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java ---------------------------------------------------------------------- diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java b/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java index ccdef87..466fb25 100644 --- a/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java +++ b/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java @@ -572,7 +572,7 @@ public class QueryContext extends AbstractQueryContext implements FailureContext getDriverStatus().setStatusMessage("Query " + getQueryHandleString() + " " + state.name().toLowerCase()); } getDriverStatus().setState(state); - synchronized (this.driverStatusUpdateListeners) { + synchronized (this) { for (QueryDriverStatusUpdateListener listener : this.driverStatusUpdateListeners) { listener.onDriverStatusUpdated(getQueryHandle(), getDriverStatus()); } @@ -588,10 +588,8 @@ public class QueryContext extends AbstractQueryContext implements FailureContext } - public void registerStatusUpdateListener(QueryDriverStatusUpdateListener driverStatusUpdateListener) { - synchronized (this.driverStatusUpdateListeners) { - this.driverStatusUpdateListeners.add(driverStatusUpdateListener); - } + public synchronized void registerStatusUpdateListener(QueryDriverStatusUpdateListener driverStatusUpdateListener) { + this.driverStatusUpdateListeners.add(driverStatusUpdateListener); } @Override
