Fix quality flaw

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
index d6693eae1c782a3ed8e46277244c900b0717859c..df4ef97c70d6c6d26da16737213c0476bc077bc2 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/db/ComponentDao.java
@@ -150,7 +150,6 @@ public class ComponentDao extends BaseDao<ComponentMapper, ComponentDto, String>
 
   @Override
   protected void doDeleteByKey(DbSession session, String key) {
-    // TODO shouldn't we need to also delete snapshots ?
     mapper(session).deleteByKey(key);
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
index 63aefc3f2d6839e36e571db4449155bc7f0eaaf9..8542278a95145ad4b7ef1edc5d23ccd91dbd4ff2 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
@@ -188,7 +188,7 @@ public class UserUpdater implements ServerComponent {
     if (updateUser.isScmAccountsChanged()) {
       List<String> scmAccounts = updateUser.scmAccounts();
       if (scmAccounts != null && !scmAccounts.isEmpty()) {
-        scmAccounts = sanitizeScmAccounts(updateUser.scmAccounts());
+        scmAccounts = sanitizeScmAccounts(scmAccounts);
         validateScmAccounts(dbSession, scmAccounts, userDto.getLogin(), email != null ? email : userDto.getEmail(), userDto, messages);
         userDto.setScmAccounts(convertScmAccountsToCsv(scmAccounts));
       } else {