Merge "[POLICY-8] clean commons from sonar blockers"

2 files changed, 26 insertions, 11 deletions

diff --git a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java b/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java
index 549651fb..eb0bffc7 100644
--- a/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java
+++ b/common-logging/src/main/java/org/openecomp/policy/common/logging/eelf/EventData.java
@@ -73,21 +73,36 @@ public class EventData {
 	public String toString(){
 		return requestID + " Starting Time : " + this.startTime + " Ending Time : " + this.endTime;
 	}
+
 	@Override
-	public int hashCode(){
-		final int prime =31;
-		int result =1;
-		result = prime * result +((requestID == null) ? 0: requestID.hashCode());
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((requestID == null) ? 0 : requestID.hashCode());
 		return result;
 	}
+
 	@Override
-	public boolean equals(Object obj){
-		
-		String requestId = (String) obj;
-		if(requestID != null && requestID.equals(requestId)){
+	public boolean equals(Object obj) {
+		if (this == obj)
 			return true;
+		if (obj == null)
+			return false;	
+		if (obj instanceof String) {
+			String requestId = (String) obj;
+			if(requestID != null && requestID.equals(requestId)){
+				return true;
+			}
+			return false;
 		}
-		return false;
+		if (getClass() != obj.getClass())
+			return false;
+		EventData other = (EventData) obj;
+		if (requestID == null) {
+			if (other.requestID != null)
+				return false;
+		} else if (!requestID.equals(other.requestID))
+			return false;
+		return true;
 	}
-
 }
diff --git a/site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java b/site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java
index 3344f923..52f36e33 100644
--- a/site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java
+++ b/site-manager/src/main/java/org/openecomp/policy/common/sitemanager/Main.java
@@ -167,7 +167,7 @@ public class Main
 		System.exit(1);
 	  }
 
-	if (cmd.getOptionValue('h') != null || cmd.getOptionValue('?') != null)
+	if (cmd == null || cmd.getOptionValue('h') != null || cmd.getOptionValue('?') != null)
 	  {
 		help();
 		System.exit(0);