SONAR-7986 Remove property set values when removing property set

1 files changed, 6 insertions, 2 deletions

diff --git a/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java b/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java
index 38683018c91..cba42d90e9f 100644
--- a/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/property/PropertiesDao.java
@@ -152,14 +152,18 @@ public class PropertiesDao implements Dao {
   @CheckForNull
   public PropertyDto selectProjectProperty(long resourceId, String propertyKey) {
     DbSession session = mybatis.openSession(false);
-    PropertiesMapper mapper = session.getMapper(PropertiesMapper.class);
     try {
-      return mapper.selectByKey(new PropertyDto().setKey(propertyKey).setResourceId(resourceId));
+      return selectProjectProperty(session, resourceId, propertyKey);
     } finally {
       MyBatis.closeQuietly(session);
     }
   }
 
+  @CheckForNull
+  public PropertyDto selectProjectProperty(DbSession dbSession, long resourceId, String propertyKey) {
+    return dbSession.getMapper(PropertiesMapper.class).selectByKey(new PropertyDto().setKey(propertyKey).setResourceId(resourceId));
+  }
+
   public List<PropertyDto> selectByQuery(PropertyQuery query, DbSession session) {
     return session.getMapper(PropertiesMapper.class).selectByQuery(query);
   }