From 287a70337176ca573ff121ecb4f4d8b4f74d5e24 Mon Sep 17 00:00:00 2001
From: nick <nick@avalr.com.ua>
Date: Mon, 4 Sep 2023 11:43:40 +0300
Subject: [PATCH 1/3] lwm2m:  fix_bug LwM2M Resource path for Install Script is
 'NULL'

---
 .../org/thingsboard/server/service/install/InstallScripts.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
index 36ec2b9b78..f1ad2ef393 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
@@ -282,13 +282,11 @@ public class InstallScripts {
                             doSaveLwm2mResource(tbResource);
                         } catch (Exception e) {
                             log.error("Unable to load resource lwm2m object model from file: [{}]", path.toString());
-                            throw new RuntimeException("resource lwm2m object model from file", e);
                         }
                     }
             );
         } catch (Exception e) {
             log.error("Unable to load resources lwm2m object model from file: [{}]", resourceLwm2mPath.toString());
-            throw new RuntimeException("resource lwm2m object model from file", e);
         }
     }
 

From 8421b21f1e4ee32de5f54ca33f54440d873a16d2 Mon Sep 17 00:00:00 2001
From: nick <nick@avalr.com.ua>
Date: Mon, 4 Sep 2023 17:07:53 +0300
Subject: [PATCH 2/3] lwm2m:          Path resourceLwm2mPath add getDataDir()

---
 .../org/thingsboard/server/service/install/InstallScripts.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
index f1ad2ef393..3208b2493b 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
@@ -268,7 +268,7 @@ public class InstallScripts {
     }
 
     public void loadSystemLwm2mResources() {
-        Path resourceLwm2mPath = Paths.get(dataDir, MODELS_LWM2M_DIR);
+        Path resourceLwm2mPath = Paths.get(getDataDir(), MODELS_LWM2M_DIR);
         try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(resourceLwm2mPath, path -> path.toString().endsWith(InstallScripts.XML_EXT))) {
             dirStream.forEach(
                     path -> {

From b93d0cdb914228b89ef2c7a517e1265034b78937 Mon Sep 17 00:00:00 2001
From: nick <nick@avalr.com.ua>
Date: Tue, 5 Sep 2023 12:53:05 +0300
Subject: [PATCH 3/3] lwm2m:  return Exception

---
 .../org/thingsboard/server/service/install/InstallScripts.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
index 3208b2493b..92a2c28181 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
@@ -282,11 +282,13 @@ public class InstallScripts {
                             doSaveLwm2mResource(tbResource);
                         } catch (Exception e) {
                             log.error("Unable to load resource lwm2m object model from file: [{}]", path.toString());
+                            throw new RuntimeException("resource lwm2m object model from file", e);
                         }
                     }
             );
         } catch (Exception e) {
             log.error("Unable to load resources lwm2m object model from file: [{}]", resourceLwm2mPath.toString());
+            throw new RuntimeException("resource lwm2m object model from file", e);
         }
     }