diff --git a/src/com/owncloud/android/lib/common/DynamicSessionManager.java b/src/com/owncloud/android/lib/common/DynamicSessionManager.java index bfd37af3..e478f383 100644 --- a/src/com/owncloud/android/lib/common/DynamicSessionManager.java +++ b/src/com/owncloud/android/lib/common/DynamicSessionManager.java @@ -45,12 +45,12 @@ public class DynamicSessionManager implements OwnCloudClientManager { @Override public OwnCloudClient removeClientFor(OwnCloudAccount account) { - OwnCloudClient clientRemoved = mSimpleFactoryManager.removeClientFor(account); - OwnCloudClient clientRemoved2 = mSingleSessionManager.removeClientFor(account); - if (clientRemoved2 != null) { - return clientRemoved2; + OwnCloudClient clientRemovedFromFactoryManager = mSimpleFactoryManager.removeClientFor(account); + OwnCloudClient clientRemovedFromSingleSessionManager = mSingleSessionManager.removeClientFor(account); + if (clientRemovedFromSingleSessionManager != null) { + return clientRemovedFromSingleSessionManager; } else { - return clientRemoved; + return clientRemovedFromFactoryManager; } // clientRemoved and clientRemoved2 should not be != null at the same time }