[phoenix] branch 5.1 updated: PHOENIX-6950 PhoenixDriver APIs should unlock closeLock only if thread is able to take lock (#1609)

[vjasani]

This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
     new d12a9d9dd3 PHOENIX-6950 PhoenixDriver APIs should unlock closeLock 
only if thread is able to take lock (#1609)
d12a9d9dd3 is described below

commit d12a9d9dd3a967948c06ee5c04c7a90e3de26ab5
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Thu May 18 12:55:25 2023 -0700

    PHOENIX-6950 PhoenixDriver APIs should unlock closeLock only if thread is 
able to take lock (#1609)
---
 .../src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
index 7ec8ebd7aa..2b130083d6 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
@@ -183,8 +183,8 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
 
     @Override
     public QueryServices getQueryServices() throws SQLException {
+        lockInterruptibly(LockMode.READ);
         try {
-            lockInterruptibly(LockMode.READ);
             checkClosed();
             // Lazy initialize QueryServices so that we only attempt to create 
an HBase Configuration
             // object upon the first attempt to connect to any cluster. 
Otherwise, an attempt will be
@@ -215,8 +215,8 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
         if (!acceptsURL(url)) {
           return null;
         }
+        lockInterruptibly(LockMode.READ);
         try {
-            lockInterruptibly(LockMode.READ);
             checkClosed();
             return createConnection(url, info);
         } finally {
@@ -226,8 +226,8 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
     
     @Override
     protected ConnectionQueryServices getConnectionQueryServices(String url, 
final Properties info) throws SQLException {
+        lockInterruptibly(LockMode.READ);
         try {
-            lockInterruptibly(LockMode.READ);
             checkClosed();
             ConnectionInfo connInfo = ConnectionInfo.create(url);
             SQLException sqlE = null;
@@ -292,8 +292,8 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
 
     @Override
     public synchronized void close() throws SQLException {
+        lockInterruptibly(LockMode.WRITE);
         try {
-            lockInterruptibly(LockMode.WRITE);
             if (closed) {
                 return;
             }