diff options
| author |   Michael Dürre <michael.duerre@highstreet-technologies.com> | 2022-10-11 11:08:59 +0200 |
|---|---|---|
| committer |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2022-10-24 11:15:04 -0400 |
| commit | ac86c13e723f6d7cc70526c9ac3080f565ee2da2 (patch) | |
| tree | b741a9553337557b0791b2bb7bdb6fbbc6ce9407 | |
| parent | 92897647669a61e773a8ec1726c1e98b85c315ac (diff) | |
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>
6 files changed, 1 insertions, 21 deletions
diff --git a/sdnr/northbound/CMNotify/provider/pom.xml b/sdnr/northbound/CMNotify/provider/pom.xml index 8b9c0f7a9..3a65a16cf 100644 --- 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 2ad5999a4..53f98acd6 100644 --- 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 b57bc4d8b..8a75e3261 100644 --- 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 7b020a555..6154d7b51 100644 --- 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 064308de9..9510264a2 100644 --- 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 cabe6bed0..cb66fc6fb 100644 --- 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"); |