aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArundathi Patil <arundpil@in.ibm.com>2018-08-28 12:46:42 +0530
committerIBM602-PC0F1E3C\Arundathi <arundpil@in.ibm.com>2018-08-28 12:46:52 +0530
commitbc6260e4b214d8a1544e653a3f6a63d525ac9d7a (patch)
treef5ff28e50cbd0681f9b043030679175ad3006042
parentc79755d43c123176515e5cafbba0774a03d297d3 (diff)
MusicCore.java : Fixed sonar issue
Fixed sonar issue, null pointer exception could be thrown Issue-ID: MUSIC-111 Change-Id: I4ea473a5e656292ecfd807ab84793f7c4ec233b2 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
-rw-r--r--src/main/java/org/onap/music/main/MusicCore.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/onap/music/main/MusicCore.java b/src/main/java/org/onap/music/main/MusicCore.java
index b729ba74..aaaeae34 100644
--- a/src/main/java/org/onap/music/main/MusicCore.java
+++ b/src/main/java/org/onap/music/main/MusicCore.java
@@ -73,7 +73,10 @@ public class MusicCore {
public boolean testCondition() throws Exception {
// first generate the row
ResultSet results = quorumGet(selectQueryForTheRow);
- Row row = results.one();
+ Row row = null;
+ if(results != null) {
+ row = results.one();
+ }
return getDSHandle().doesRowSatisfyCondition(row, conditions);
}
}
@@ -288,7 +291,8 @@ public class MusicCore {
MusicLockState newMls = null;
try {
currentMls = getMusicLockState(key);
- String currentLockHolder = currentMls.getLockHolder();
+ String currentLockHolder = null;
+ if(currentMls != null) { currentLockHolder = currentMls.getLockHolder(); };
if (lockId.equals(currentLockHolder)) {
logger.info(EELFLoggerDelegate.applicationLogger,"In acquire lock: You already have the lock!");
return new ReturnType(ResultType.SUCCESS, "You already have the lock!");