Quality profile's copy should user a different session when reading active rules...

diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ESActiveRule.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ESActiveRule.java
index 4a1b9042e10dd108fb8a116cb76753ba2049d5e0..4de69c4035aa1a00286062254c838706d34be84d 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/ESActiveRule.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ESActiveRule.java
@@ -88,6 +88,15 @@ public class ESActiveRule {
     }
   }
 
+  public void bulkIndexProfile(int profileId) {
+    SqlSession session = myBatis.openSession();
+    try {
+      bulkIndexProfile(profileId, session);
+    } finally {
+      MyBatis.closeQuietly(session);
+    }
+  }
+
   public void bulkIndexProfile(int profileId, SqlSession session) {
     bulkIndexActiveRules(activeRuleDao.selectByProfileId(profileId, session), session);
   }

diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
index 8759f9a0b1f549032472d4b743179c3675178a60..1d123e4995a16debf30e723ad959a0ab7a44b3d3 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
@@ -198,8 +198,9 @@ public class QProfileOperations implements ServerComponent {
       QualityProfileDto profileDto = findNotNull(profileId, session);
       checkNotAlreadyExists(copyProfileName, profileDto.getLanguage(), session);
       int copyProfileId = profilesManager.copyProfile(profileId, copyProfileName);
-      session.commit();
-      esActiveRule.bulkIndexProfile(copyProfileId, session);
+
+      // Cannot reuse same session as hibernate as create active rules in another session
+      esActiveRule.bulkIndexProfile(copyProfileId);
     } finally {
       MyBatis.closeQuietly(session);
     }

diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
index 3848a6e3799e69aaaad5456ffceb7d65aef030a2..9642793fb1b2931c673a31d1112d9be358751318 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
@@ -390,8 +390,7 @@ public class QProfileOperationsTest {
     operations.copyProfile(1, "Copy Default", authorizedUserSession);
 
     verify(profilesManager).copyProfile(1, "Copy Default");
-    verify(session).commit();
-    verify(esActiveRule).bulkIndexProfile(2, session);
+    verify(esActiveRule).bulkIndexProfile(2);
   }
 
   @Test