From 65c6daf0e9715f169d1d991fe33dba354f42b0ec Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 7 Jan 2015 09:24:37 +0100
Subject: [PATCH] Fix quality flaw

---
 .../main/java/org/sonar/server/component/db/ComponentDao.java   | 1 -
 .../src/main/java/org/sonar/server/user/UserUpdater.java        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

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 d6693eae1c7..df4ef97c70d 100644
--- 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 63aefc3f2d6..8542278a951 100644
--- 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 {
-- 
2.39.5