From a85726c8f611175a21fb55c139f8430ea82fc39d Mon Sep 17 00:00:00 2001
From: "Thomas Nelson Jr (arthurdent3) tn1381@att.com" <tn1381@att.com>
Date: Mon, 5 Mar 2018 14:18:37 -0500
Subject: Some Sonar and CLM issues resolved.

- Update some library versions fro CLM
- Some code fixes for Sonar

Change-Id: I270955be6337400f1d30556cfa854712f102916e
Issue-ID: MUSIC-40
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
---
 .../org/onap/music/lockingservice/ProtocolSupport.java    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/main/java/org/onap/music/lockingservice/ProtocolSupport.java')

diff --git a/src/main/java/org/onap/music/lockingservice/ProtocolSupport.java b/src/main/java/org/onap/music/lockingservice/ProtocolSupport.java
index df4d6ad6..ec612bcd 100644
--- a/src/main/java/org/onap/music/lockingservice/ProtocolSupport.java
+++ b/src/main/java/org/onap/music/lockingservice/ProtocolSupport.java
@@ -21,8 +21,6 @@
  */
 package org.onap.music.lockingservice;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs;
@@ -49,10 +47,6 @@ class ProtocolSupport {
     private int retryCount = 10;
     private List<ACL> acl = ZooDefs.Ids.OPEN_ACL_UNSAFE;
 
-    // public ProtocolSupport(ZooKeeper zookeeper) {
-    // this.zookeeper = zookeeper;
-    // }
-
     /**
      * Closes this strategy and releases any ZooKeeper resources; but keeps the ZooKeeper instance
      * open
@@ -111,7 +105,9 @@ class ProtocolSupport {
     /**
      * Allow derived classes to perform some custom closing operations to release resources
      */
-    protected void doClose() {}
+    protected void doClose() {
+        throw new UnsupportedOperationException();
+    }
 
 
     /**
@@ -173,9 +169,7 @@ class ProtocolSupport {
                     return true;
                 }
             });
-        } catch (KeeperException e) {
-            LOG.error(EELFLoggerDelegate.errorLogger,"Caught: " + e, e);
-        } catch (InterruptedException e) {
+        } catch (InterruptedException|KeeperException e) {
             LOG.error(EELFLoggerDelegate.errorLogger,"Caught: " + e, e);
         }
     }
@@ -200,6 +194,7 @@ class ProtocolSupport {
                 Thread.sleep(attemptCount * retryDelay);
             } catch (InterruptedException e) {
                 LOG.error(EELFLoggerDelegate.errorLogger,"Failed to sleep: " + e, e);
+                Thread.currentThread().interrupt();
             }
         }
     }
-- 
cgit 1.2.3-korg