client: correct the client_lock order when cleanup

    As 448bea4, we need to handle a dependency
    between client lock and admin socket lock.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 7fcd907bc6898df80b1fe8760b64f2e27633cbf7..1e79390964a600dce481e09f03cbe824919d800e 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -490,9 +490,9 @@ int Client::init()
   int r = monclient->init();
   if (r < 0) {
     // need to do cleanup because we're in an intermediate init state
-    objecter->shutdown();
     timer.shutdown();
     client_lock.Unlock();
+    objecter->shutdown();
     objectcacher->stop();
     monclient->shutdown();
     return r;