apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7902: Account creation results in exception in logs

Browse Source 
Event publish code was wrapped in transaction, moved it out
This commit is contained in:
Koushik Das 2014-11-13 14:41:33 +05:30
parent 8b7c1d7c5e
commit 03e63a67e0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/user/AccountManagerImpl.java
View File

@ -977,9 +977,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
@ActionEvent(eventType = EventTypes.EVENT_USER_CREATE, eventDescription = "creating User")
})
public UserAccount createUserAccount(final String userName, final String password, final String firstName, final String lastName, final String email,
final String timezone, String accountName,
final short accountType,
Long domainId, final String networkDomain, final Map<String, String> details, String accountUUID, final String userUUID) {
final String timezone, String accountName, final short accountType, Long domainId, final String networkDomain, final Map<String, String> details,
String accountUUID, final String userUUID) {
if (accountName == null) {
accountName = userName;
@ -1045,13 +1044,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
user.setRegistrationToken(registrationToken);
}
// create correct account and group association based on accountType
if (accountType != Account.ACCOUNT_TYPE_PROJECT) {
Map<Long, Long> accountGroupMap = new HashMap<Long, Long>();
accountGroupMap.put(accountId, new Long(accountType + 1));
_messageBus.publish(_name, MESSAGE_ADD_ACCOUNT_EVENT, PublishScope.LOCAL, accountGroupMap);
}
return new Pair<Long, Account>(user.getId(), account);
}
});
@ -1059,6 +1051,13 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
long userId = pair.first();
Account account = pair.second();
// create correct account and group association based on accountType
if (accountType != Account.ACCOUNT_TYPE_PROJECT) {
Map<Long, Long> accountGroupMap = new HashMap<Long, Long>();
accountGroupMap.put(account.getId(), new Long(accountType + 1));
_messageBus.publish(_name, MESSAGE_ADD_ACCOUNT_EVENT, PublishScope.LOCAL, accountGroupMap);
}
CallContext.current().putContextParameter(Account.class, account.getUuid());
// check success