Repository: phoenix Updated Branches: refs/heads/3.0 a31bca4d6 -> 712b4e672 refs/heads/3.2 8b460b5c0 -> bc4a98848 refs/heads/4.0 623a7845e -> 37c4d3eb9 refs/heads/4.2 e0c7602de -> dd659bb48 refs/heads/master 236b8e0c7 -> 309b1f1c7
PHOENIX-1403 Correct synchronization in ConnectionQueryServicesImpl.init Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/712b4e67 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/712b4e67 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/712b4e67 Branch: refs/heads/3.0 Commit: 712b4e672b76be7b1c525c76b2f7916b196bf97b Parents: a31bca4 Author: Gabriel Reid <gabri...@ngdata.com> Authored: Tue Nov 4 13:45:19 2014 +0100 Committer: Gabriel Reid <gr...@apache.org> Committed: Tue Nov 4 21:45:33 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/712b4e67/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 557f6d4..f6791f6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -1312,7 +1312,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } return null; } - synchronized (this) { + synchronized (ConnectionQueryServicesImpl.this) { if (initialized) { if (initializationException != null) { // Throw previous initialization exception, as we won't resuse this instance
