You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/11/13 11:56:33 UTC
[1/3] git commit: updated refs/heads/master to 890f9ee
Repository: cloudstack
Updated Branches:
refs/heads/master f585dd266 -> 890f9eeb5
CLOUDSTACK-7902: Account creation results in exception in logs
Event publish code was wrapped in transaction, moved it out
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/03e63a67
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/03e63a67
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/03e63a67
Branch: refs/heads/master
Commit: 03e63a67e0d23e53f37711959c726b9576b2ed37
Parents: 8b7c1d7
Author: Koushik Das <ko...@apache.org>
Authored: Thu Nov 13 14:41:33 2014 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Thu Nov 13 14:41:33 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/user/AccountManagerImpl.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/03e63a67/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 60836a5..3c00f91 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -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
[3/3] git commit: updated refs/heads/master to 890f9ee
Posted by ra...@apache.org.
Merge branch '4.5'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/890f9eeb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/890f9eeb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/890f9eeb
Branch: refs/heads/master
Commit: 890f9eeb5704578611d92106b22b1a8ef5c78d0a
Parents: f585dd2 d2c087a
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Thu Nov 13 16:26:15 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Thu Nov 13 16:26:15 2014 +0530
----------------------------------------------------------------------
.../api/command/admin/internallb/ListInternalLBVMsCmd.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to 890f9ee
Posted by ra...@apache.org.
Update ListInternalLBVMsCmd.java
Fix typo in response name string: there was an extra 's'
Signed-off-by: Rajani Karuturi <ra...@gmail.com>
This closes #8
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2c087ae
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2c087ae
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2c087ae
Branch: refs/heads/master
Commit: d2c087aef29bac20027e0f8df27532a85f6c81b7
Parents: 03e63a6
Author: Phillip Kent <ph...@gmail.com>
Authored: Wed Apr 2 15:27:33 2014 +0100
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Thu Nov 13 16:04:27 2014 +0530
----------------------------------------------------------------------
.../api/command/admin/internallb/ListInternalLBVMsCmd.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2c087ae/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
index 0b59b73..ba2054c 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java
@@ -40,7 +40,7 @@ import com.cloud.vm.VirtualMachine;
public class ListInternalLBVMsCmd extends BaseListProjectAndAccountResourcesCmd {
public static final Logger s_logger = Logger.getLogger(ListInternalLBVMsCmd.class.getName());
- private static final String s_name = "listinternallbvmssresponse";
+ private static final String s_name = "listinternallbvmsresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////