gitqueue
diff --git a/‎api/src/com/cloud/exception/CloudException.java‎
Lines changed: 5 additions & 12 deletions b/‎api/src/com/cloud/exception/CloudException.java‎
Lines changed: 5 additions & 12 deletions
diff --git a/‎api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java‎
Lines changed: 2 additions & 3 deletions b/‎api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎api/src/org/apache/cloudstack/api/response/ExceptionResponse.java‎
Lines changed: 4 additions & 5 deletions b/‎api/src/org/apache/cloudstack/api/response/ExceptionResponse.java‎
Lines changed: 4 additions & 5 deletions
@@ -30,7 +30,7 @@
 public class CloudException extends Exception {
 
 	// 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 Integer csErrorCode;
 
@@ -44,26 +44,19 @@ public CloudException(String message, Throwable 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);
-    	}
-    	return;
-    }
+
 
 	public CloudException() {
 		super();
 		setCSErrorCode(CSExceptionErrorCode.getCSErrCode(this.getClass().getName()));
 	}
 
-	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 ArrayList<IdentityProxy> getIdProxyList() {
+	public ArrayList<String> getIdProxyList() {
 		return idList;
 	}
 
 
@@ -36,7 +36,6 @@
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.org.Cluster;
 import com.cloud.user.Account;
-import com.cloud.utils.IdentityProxy;
 
 @Implementation(description="Adds a new cluster", responseObject=ClusterResponse.class)
 public class AddClusterCmd extends BaseCmd {
@@ -173,8 +172,8 @@ public void execute(){
         } catch (ResourceInUseException ex) {
             s_logger.warn("Exception: ", ex);
             ServerApiException e = new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage());
-            for (IdentityProxy proxyObj : ex.getIdProxyList()) {
-                e.addProxyObject(proxyObj.getTableName(), proxyObj.getValue(), proxyObj.getidFieldName());
+            for (String proxyObj : ex.getIdProxyList()) {
+                e.addProxyObject(proxyObj);
             }
             throw e;
         }
 
@@ -19,14 +19,13 @@
 import java.util.ArrayList;
 
 import com.cloud.serializer.Param;
-import com.cloud.utils.IdentityProxy;
 import com.google.gson.annotations.SerializedName;
 import org.apache.cloudstack.api.BaseResponse;
 
 public class ExceptionResponse extends BaseResponse {
 
     @SerializedName("uuidList") @Param(description="List of uuids associated with this error")
-    private ArrayList<IdentityProxy> idList = new ArrayList<IdentityProxy>();
+    private ArrayList<String> idList;
 
     @SerializedName("errorcode") @Param(description="numeric code associated with this error")
     private Integer errorCode;
@@ -53,12 +52,12 @@ public void setErrorText(String errorText) {
         this.errorText = errorText;
     }
 
-    public void addProxyObject(String tableName, Long id, String idFieldName) {
-        idList.add(new IdentityProxy(tableName, id, idFieldName));
+    public void addProxyObject(String id) {
+        idList.add(id);
         return;
     }
 
-    public ArrayList<IdentityProxy> getIdProxyList() {
+    public ArrayList<String> getIdProxyList() {
         return idList;
     }