flasharray: address review on login()

- Replace nested null-check of apiVersion with !apiVersionExplicit for clarity (sureshanaparti).
- Wrap vResp.close() in the api_version-discovery finally with its own try/catch; log any IOException at debug so a failed close does not mask a successful discovery.
- Wrap the explicit response.close() after the legacy username/password auth with try/catch for the same reason.

Signed-off-by: Eugenio Grosso <eugenio.grosso@gmail.com>

Author: genegr

plugins/storage/volume/flasharray/src/main/java/org/apache/cloudstack/storage/datastore/adapter/flasharray/FlashArrayAdapter.java

@@ -594,10 +594,10 @@ private void login() {
 
         apiVersion = connectionDetails.get(FlashArrayAdapter.API_VERSION);
         boolean apiVersionExplicit = apiVersion != null;
-        if (apiVersion == null) {
+        if (!apiVersionExplicit) {
             apiVersion = queryParms.get(FlashArrayAdapter.API_VERSION);
             apiVersionExplicit = apiVersion != null;
-            if (apiVersion == null) {
+            if (!apiVersionExplicit) {
                 apiVersion = API_VERSION_DEFAULT;
             }
         }
@@ -703,7 +703,11 @@ private void login() {
                             + "/api_version, falling back to default " + API_VERSION_DEFAULT, e);
                 } finally {
                     if (vResp != null) {
-                        vResp.close();
+                        try {
+                            vResp.close();
+                        } catch (IOException e) {
+                            logger.debug("Error closing /api/api_version response from FlashArray [" + url + "]", e);
+                        }
                     }
                 }
             }
@@ -737,7 +741,11 @@ private void login() {
                             "Unexpected HTTP response code from FlashArray [" + url + "] - [" + statusCode
                                     + "] - " + response.getStatusLine().getReasonPhrase());
                 }
-                response.close();
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    logger.debug("Error closing legacy auth/apitoken response from FlashArray [" + url + "]", e);
+                }
                 response = null;
             }