http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a88ce6bb/server/src/com/cloud/network/as/AutoScaleManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java index 57509ff..d52657a 100644 --- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java @@ -77,7 +77,6 @@ import com.cloud.user.User; import com.cloud.user.UserContext; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; -import com.cloud.utils.IdentityProxy; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; import com.cloud.utils.component.Inject; @@ -562,8 +561,8 @@ public class AutoScaleManagerImpl<Type> implements AutoScaleManager, AutoScaleSe Account caller = UserContext.current().getCaller(); Account owner = _accountDao.findActiveAccount(accountName, domainId); if (owner == null) { - List<IdentityProxy> idList = new ArrayList<IdentityProxy>(); - idList.add(new IdentityProxy("domain", domainId, "domainId")); + List<String> idList = new ArrayList<String>(); + idList.add(ApiDBUtils.findDomainById(domainId).getUuid()); throw new InvalidParameterValueException("Unable to find account " + accountName + " in domain with specifed domainId"); } _accountMgr.checkAccess(caller, null, false, owner);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a88ce6bb/utils/src/com/cloud/utils/exception/RuntimeCloudException.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/exception/RuntimeCloudException.java b/utils/src/com/cloud/utils/exception/RuntimeCloudException.java index f2e9845..2334696 100644 --- a/utils/src/com/cloud/utils/exception/RuntimeCloudException.java +++ b/utils/src/com/cloud/utils/exception/RuntimeCloudException.java @@ -23,53 +23,53 @@ import java.util.ArrayList; /** * by the API response serializer. Any exceptions that are thrown by * class, which extends Exception instead of RuntimeException like this - * class does. + * class does. */ public class RuntimeCloudException extends RuntimeException { - + // This holds a list of uuids and their names. Add uuid:fieldname pairs - protected ArrayList<IdentityProxy> idList = new ArrayList<IdentityProxy>(); - + protected ArrayList<String> idList = new ArrayList<String>(); + protected int csErrorCode; - - public void addProxyObject(String tableName, Long id, String idFieldName) { - idList.add(new IdentityProxy(tableName, id, idFieldName)); + + public void addProxyObject(String uuid) { + idList.add(uuid); return; } - + public RuntimeCloudException(String message) { super(message); setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName())); } - + public RuntimeCloudException(String message, Throwable cause) { super(message, cause); setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName())); } - + public void addProxyObject(Object voObj, Long id, String idFieldName) { // Get the VO object's table name. String tablename = AnnotationHelper.getTableName(voObj); if (tablename != null) { - addProxyObject(tablename, id, idFieldName); + addProxyObject(tablename, id, idFieldName); } return; } - + public RuntimeCloudException() { super(); setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName())); } - - public ArrayList<IdentityProxy> getIdProxyList() { + + public ArrayList<String> getIdProxyList() { return idList; } - + public void setCSErrorCode(int cserrcode) { this.csErrorCode = cserrcode; } - + public int getCSErrorCode() { return this.csErrorCode; }
