From ac86c13e723f6d7cc70526c9ac3080f565ee2da2 Mon Sep 17 00:00:00 2001 From: Michael Dürre Date: Tue, 11 Oct 2022 11:08:59 +0200 Subject: fix mariadb init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix mariadb startup with controllerId set Fixed compile issue due to expired sli version Issue-ID: CCSDK-3786 Signed-off-by: Michael Dürre Change-Id: I1edda62e928385f144245223281c5a3540016590 Signed-off-by: Michael Dürre --- .../sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sdnr/wt/data-provider') 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"); -- cgit 1.2.3-korg