Merge "revert few sonar fixes"

6 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java
index b3f3c8f..4e54a3c 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java
@@ -119,7 +119,7 @@ public class Kafka011Consumer implements Consumer {
 		} catch (InterruptedException x) {
 			log.warn("After size>0, pending msg take() threw InterruptedException. Ignoring. (" + x.getMessage() + ")",
 					x);
-			Thread.currentThread().interrupt();
+			//Thread.currentThread().interrupt();
 		}
 
 		Callable<Boolean> run = new Callable<Boolean>() {
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java
index 04d1d9e..00b6a75 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java
@@ -299,7 +299,7 @@ public class KafkaConsumerCache {
 				curator.blockUntilConnected();
 			} catch (InterruptedException e) {
 				log.error("error while setting curator framework :",e);
-				Thread.currentThread().interrupt();
+				//Thread.currentThread().interrupt();
 			}
 		}
 
@@ -512,7 +512,7 @@ public class KafkaConsumerCache {
 			Thread.sleep(consumerHandoverWaitMs);
 		} catch (InterruptedException e) {
 			log.error("InterruptedException in dropTimedOutConsumer",e);
-			Thread.currentThread().interrupt();
+			//Thread.currentThread().interrupt();
 		}
 		log.info("Dropped " + key + " consumer due to timeout");
 	}
@@ -669,7 +669,7 @@ public class KafkaConsumerCache {
 			Thread.sleep(consumerHandoverWaitMs);
 		} catch (InterruptedException e) {
 			log.error("InterruptedException in signalOwnership",e);
-			Thread.currentThread().interrupt();
+			//Thread.currentThread().interrupt();
 		}
 	}
 
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java
index f645c8d..01c46e7 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java
@@ -154,7 +154,7 @@ public class DMaaPCambriaLimiter {
 				}
 			} catch (InterruptedException e) {
 				log.error("Exception "+ e);
-				Thread.currentThread().interrupt();
+				//Thread.currentThread().interrupt();
 			}
 			
 			
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
index f59f704..9c1fcb2 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java
@@ -198,7 +198,7 @@ public class DMaaPCambriaSimplerBatchPublisher extends CambriaBaseClient
 			}
 		} catch (InterruptedException e) {
 			getLog().warn("Possible message loss. " + e.getMessage(), e);
-			Thread.currentThread().interrupt();
+			//Thread.currentThread().interrupt();
 		} catch (IOException e) {
 			getLog().warn("Possible message loss. " + e.getMessage(), e);
 		}
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java
index 537fc22..27ffc89 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java
@@ -333,7 +333,7 @@ public class CambriaOutboundEventStream implements StreamWriter {
 					// FIXME: would be good to wait/signal
 					Thread.sleep(100);
 				} catch (InterruptedException e) {
-				    Thread.currentThread().interrupt();
+				  //  Thread.currentThread().interrupt();
 				}
 			}
 		});
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java
index 5ce45ac..11c544f 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java
@@ -220,7 +220,7 @@ public class EventsServiceImpl implements EventsService {
 			}
 		}
 		// if headers are not provided then user will be null
-		if (topicNameEnforced&&user == null && null != ctx.getRequest().getHeader("Authorization")) {
+		if (topicNameEnforced ||(user == null && null != ctx.getRequest().getHeader("Authorization"))) {
 			// the topic name will be sent by the client
 			
 			DMaaPAAFAuthenticator aaf = new DMaaPAAFAuthenticatorImpl();