From b2314f152d88534fd5f999350e9c60e106c7d408 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Wed, 30 May 2018 16:16:42 -0500
Subject: [PATCH] MCOL-1370

---
 oam/oamcpp/liboamcpp.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 0536fbacb..b6fb8dc2d 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -5478,18 +5478,24 @@ namespace oam
 		}
 
 		//detach first to make sure DBS can be detach before trying to move to another pm
-		try
+		DBRootConfigList::iterator pt3 = residedbrootConfigList.begin();
+		for( ; pt3 != residedbrootConfigList.end() ; )
 		{
-			typedef std::vector<string> dbrootList;
-			dbrootList dbrootlist;
-			dbrootlist.push_back(itoa(dbrootID));
+			int dbrootID = *pt3;
 
-			amazonDetach(dbrootlist);
-		}
-		catch (exception& )
-		{
-			writeLog("ERROR: amazonDetach failure", LOG_TYPE_ERROR );
-			exceptionControl("autoMovePmDbroot", API_DETACH_FAILURE);
+			try
+			{
+				typedef std::vector<string> dbrootList;
+				dbrootList dbrootlist;
+				dbrootlist.push_back(itoa(dbrootID));
+
+				amazonDetach(dbrootlist);
+			}
+			catch (exception& )
+			{
+				writeLog("ERROR: amazonDetach failure", LOG_TYPE_ERROR );
+				exceptionControl("autoMovePmDbroot", API_DETACH_FAILURE);
+			}
 		}
 
 		//get dbroot id for other PMs