on Account rename, rename mutes only after successful merge of the ch…

…ange to the backing storage

src/main/java/com/springrts/tasserver/commands/impl/RenameAccountCommandProcessor.java

@@ -69,16 +69,11 @@ public boolean process(Client client, List<String> args)
 		}
 
 		Account acc = getContext().getAccountsService().findAccountNoCase(newUsername);
-		if (acc != null && acc != client.getAccount()) {
+		if ((acc != null) && (acc != client.getAccount())) {
 			client.sendLine("SERVERMSG RENAMEACCOUNT failed: Account with same username already exists!");
 			return false;
 		}
 
-		// make sure all mutes are accordingly adjusted to new userName:
-		for (int i = 0; i < getContext().getChannels().getChannelsSize(); i++) {
-			getContext().getChannels().getChannel(i).getMuteList().rename(client.getAccount().getName(), newUsername);
-		}
-
 		final String oldName = client.getAccount().getName();
 		Account accountNew = client.getAccount().clone();
 		accountNew.setName(newUsername);
@@ -92,6 +87,11 @@ public boolean process(Client client, List<String> args)
 			return false;
 		}
 
+		// make sure all mutes are accordingly adjusted to the new userName:
+		for (int i = 0; i < getContext().getChannels().getChannelsSize(); i++) {
+			getContext().getChannels().getChannel(i).getMuteList().rename(client.getAccount().getName(), newUsername);
+		}
+
 		client.sendLine(new StringBuilder("SERVERMSG Your account has been renamed to <")
 				.append(accountNew.getName())
 				.append(">. Reconnect with new account (you will now be automatically disconnected)!").toString());