fix violations

2 files changed, 8 insertions, 4 deletions

diff --git a/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java b/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java
index 5f8490a3858..e6e36cc1587 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/session/CustomHibernateConnectionProvider.java
@@ -26,11 +26,15 @@ import java.util.Properties;
 
 public class CustomHibernateConnectionProvider extends InjectedDataSourceConnectionProvider {
 
-  static DataSource datasource;
-  
+  private static DataSource datasourceForConfig;
+
+  static void setDatasourceForConfig(DataSource ds) {
+    CustomHibernateConnectionProvider.datasourceForConfig = ds;
+  }
+
   @Override
   public void configure(Properties props) {
-    setDataSource(datasource);
+    setDataSource(datasourceForConfig);
     super.configure(props);
   }
 }
diff --git a/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java b/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java
index cf1e4b83210..b1bed908691 100644
--- a/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java
+++ b/sonar-core/src/main/java/org/sonar/jpa/session/DefaultDatabaseConnector.java
@@ -54,7 +54,7 @@ public class DefaultDatabaseConnector extends AbstractDatabaseConnector {
 
   private void createDatasource() {
     try {
-      CustomHibernateConnectionProvider.datasource = database.getDataSource();
+      CustomHibernateConnectionProvider.setDatasourceForConfig(database.getDataSource());
     } catch (Exception e) {
       throw new SonarException("Fail to connect to database", e);
     }