fix mariadb init

fix mariadb startup with controllerId set
Fixed compile issue due to expired sli version

Issue-ID: CCSDK-3786
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I1edda62e928385f144245223281c5a3540016590
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

diff --git a/sdnr/northbound/CMNotify/provider/pom.xml b/sdnr/northbound/CMNotify/provider/pom.xml
index 8b9c0f7..3a65a16 100644 (file)
--- a/sdnr/northbound/CMNotify/provider/pom.xml
+++ b/sdnr/northbound/CMNotify/provider/pom.xml
@@ -36,10 +36,6 @@
 
     <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.version>1.5.0-SNAPSHOT</ccsdk.sli.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>

diff --git a/sdnr/northbound/addCMHandle/provider/pom.xml b/sdnr/northbound/addCMHandle/provider/pom.xml
index 2ad5999..53f98ac 100644 (file)
--- a/sdnr/northbound/addCMHandle/provider/pom.xml
+++ b/sdnr/northbound/addCMHandle/provider/pom.xml
@@ -36,10 +36,6 @@
 
     <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.version>1.5.0-SNAPSHOT</ccsdk.sli.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>

diff --git a/sdnr/northbound/oofpcipoc/consumer/pom.xml b/sdnr/northbound/oofpcipoc/consumer/pom.xml
index b57bc4d..8a75e32 100644 (file)
--- a/sdnr/northbound/oofpcipoc/consumer/pom.xml
+++ b/sdnr/northbound/oofpcipoc/consumer/pom.xml
@@ -36,10 +36,6 @@
 
     <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.version>1.5.0-SNAPSHOT</ccsdk.sli.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>

diff --git a/sdnr/northbound/oofpcipoc/provider/pom.xml b/sdnr/northbound/oofpcipoc/provider/pom.xml
index 7b020a5..6154d7b 100644 (file)
--- a/sdnr/northbound/oofpcipoc/provider/pom.xml
+++ b/sdnr/northbound/oofpcipoc/provider/pom.xml
@@ -36,10 +36,6 @@
 
     <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.version>1.5.0-SNAPSHOT</ccsdk.sli.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>

diff --git a/sdnr/northbound/ranSlice/provider/pom.xml b/sdnr/northbound/ranSlice/provider/pom.xml
index 064308d..9510264 100644 (file)
--- a/sdnr/northbound/ranSlice/provider/pom.xml
+++ b/sdnr/northbound/ranSlice/provider/pom.xml
@@ -36,10 +36,6 @@
 
     <name>ccsdk-features :: sdnr-northbound :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.version>1.5.0-SNAPSHOT</ccsdk.sli.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>

diff --git a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java
index cabe6be..cb66fc6 100644 (file)
--- a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java
+++ b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java
@@ -512,7 +512,7 @@ public class SqlDBDataProvider extends HtDatabaseEventsService implements Databa
             query = String.format("INSERT INTO `%s` (`id`,`desc`) VALUES ('%s','%s')", this.controllerTableName,
                     this.controllerId, "");
             LOG.trace(query);
-            try { data.close(); } catch (SQLException ignore) { }
+            try { if(data!=null){data.close();} } catch (SQLException ignore) { }
             return this.dbClient.write(query);
         } else {
             LOG.trace("controllerId already set");