Fix loading of Java configuration when Ruby on Rails inserts new rows

1 files changed, 5 insertions, 0 deletions

diff --git a/sonar-core/src/main/java/org/sonar/api/database/configuration/DatabaseConfiguration.java b/sonar-core/src/main/java/org/sonar/api/database/configuration/DatabaseConfiguration.java
index 70b49625d69..21c37629cf1 100644
--- a/sonar-core/src/main/java/org/sonar/api/database/configuration/DatabaseConfiguration.java
+++ b/sonar-core/src/main/java/org/sonar/api/database/configuration/DatabaseConfiguration.java
@@ -48,6 +48,11 @@ public class DatabaseConfiguration extends BaseConfiguration {
   public void load() {
     clear();
 
+    // Ugly workaround before the move to myBatis
+    // Session is not up-to-date when Ruby on Rails inserts new rows in its own transaction. Seems like
+    // Hibernate keeps a cache...
+    getSession().commit();
+
     List<Property> properties = getSession()
         .createQuery("from " + Property.class.getSimpleName() + " p where p.resourceId is null and p.userId is null")
         .getResultList();