From 0db9303bcabebc19bdd6457e452c3ccaa2881542 Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Thu, 11 Nov 2010 17:04:03 -0800
Subject: [PATCH] don't break others

---
 .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java   | 4 ++--
 .../cloud/storage/secondary/SecondaryStorageManagerImpl.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index f11991cc209..369de47ef6b 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -531,7 +531,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
     @Override
     public ConsoleProxyVO startProxy(long proxyVmId, long startEventId) {
         try {
-            return start2(proxyVmId, startEventId);
+            return start(proxyVmId, startEventId);
         } catch (StorageUnavailableException e) {
             s_logger.warn("Exception while trying to start console proxy", e);
             return null;
@@ -927,7 +927,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
         if (s_logger.isDebugEnabled())
             s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
 
-        Map<String, Object> context = createProxyInstance2(dataCenterId);
+        Map<String, Object> context = createProxyInstance(dataCenterId);
 
         long proxyVmId = (Long) context.get("proxyVmId");
         if (proxyVmId == 0) {
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index 76079f6b9ea..b2ce8fa8322 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
@@ -262,7 +262,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
 	public SecondaryStorageVmVO startSecStorageVm(long secStorageVmId, long startEventId) {
 		try {
 
-			return start2(secStorageVmId, startEventId);
+			return start(secStorageVmId, startEventId);
 
 		} catch (StorageUnavailableException e) {
 			s_logger.warn("Exception while trying to start secondary storage vm", e);
@@ -684,7 +684,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
 		if (s_logger.isDebugEnabled())
 			s_logger.debug("Assign secondary storage vm from a newly started instance for request from data center : " + dataCenterId);
 
-		Map<String, Object> context = createSecStorageVmInstance2(dataCenterId);
+		Map<String, Object> context = createSecStorageVmInstance(dataCenterId);
 
 		long secStorageVmId = (Long) context.get("secStorageVmId");
 		if (secStorageVmId == 0) {