prevent orientdb NPE on warning message on init (#30)

OpenIdentityPlatform · May 20, 2024 · bf79ee4 · bf79ee4
1 parent 54dae00
commit bf79ee4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/impl/DBHelper.java b/openidm-repo-orientdb/src/main/java/org/forgerock/openidm/repo/orientdb/impl/DBHelper.java
@@ -96,7 +96,9 @@ public synchronized static ODatabaseDocumentPool getPool(String dbURL, String us
         ODatabaseDocumentTx setupDbConn = null;
         ODatabaseDocumentPool pool;
         try {
-            OLogManager.instance().setWarnEnabled(false);
+            if (Double.parseDouble(System.getProperty("java.specification.version")) >= 15) {
+                OLogManager.instance().setWarnEnabled(false);
+            }
             if (setupDB) {
                 logger.debug("Check DB exists in expected state for pool {}", dbURL);
                 setupDbConn = checkDB(dbURL, user, password, completeConfig);
@@ -108,7 +110,9 @@ public synchronized static ODatabaseDocumentPool getPool(String dbURL, String us
                 pools.put(dbURL, pool);
             }
         } finally {
-            OLogManager.instance().setWarnEnabled(true);
+            if (Double.parseDouble(System.getProperty("java.specification.version")) >= 15) {
+                OLogManager.instance().setWarnEnabled(true);
+            }
             if (setupDbConn != null) {
                 setupDbConn.activateOnCurrentThread();
                 setupDbConn.close();

diff --git a/...epo-orientdb/src/test/java/org/forgerock/openidm/repo/orientdb/impl/DocumentUtilTest.java b/...epo-orientdb/src/test/java/org/forgerock/openidm/repo/orientdb/impl/DocumentUtilTest.java
@@ -28,6 +28,7 @@
 import static org.forgerock.json.JsonValue.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.metadata.schema.OType;
@@ -59,7 +60,13 @@ public class DocumentUtilTest {
 
     @BeforeClass 
     public void init() throws Exception {
+        if (Double.parseDouble(System.getProperty("java.specification.version")) >= 15) {
+            OLogManager.instance().setWarnEnabled(false);
+        }
         db = new ODatabaseDocumentTx(dbURL);
+        if (Double.parseDouble(System.getProperty("java.specification.version")) >= 15) {
+            OLogManager.instance().setWarnEnabled(true);
+        }
         if (!db.exists()) {
             db.create();
         } else {