From 9c888f4fefe6ff415fbe8c983a02a90c3080f8ca Mon Sep 17 00:00:00 2001
From: Sergey Ponomarev <stokito@gmail.com>
Date: Sun, 20 Jul 2025 11:48:01 +0300
Subject: [PATCH] Avoid NPE on getResourceAsStream() calls

When the resource i.g. properties file is not available the getResourceAsStream() returns null and this cuauses unhandled NPE.
---
 .../main/java/org/jivesoftware/resource/ConfigurationRes.java | 4 +++-
 core/src/main/java/org/jivesoftware/resource/Default.java     | 4 +++-
 core/src/main/java/org/jivesoftware/resource/SoundsRes.java   | 4 +++-
 core/src/main/java/org/jivesoftware/resource/SparkRes.java    | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java b/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java
index e38cbb3a..561206d9 100644
--- a/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java
+++ b/core/src/main/java/org/jivesoftware/resource/ConfigurationRes.java
@@ -40,7 +40,9 @@ public class ConfigurationRes {
         try
         {
             InputStream resourceAsStream = cl.getResourceAsStream( "configuration.properties" );
-            prb.load( resourceAsStream );
+            if (resourceAsStream != null) {
+                prb.load( resourceAsStream );
+            }
         }
         catch ( IOException e )
         {
diff --git a/core/src/main/java/org/jivesoftware/resource/Default.java b/core/src/main/java/org/jivesoftware/resource/Default.java
index 60484053..370db6e1 100644
--- a/core/src/main/java/org/jivesoftware/resource/Default.java
+++ b/core/src/main/java/org/jivesoftware/resource/Default.java
@@ -155,7 +155,9 @@ public class Default {
         try
         {
             InputStream resourceAsStream = cl.getResourceAsStream( "default.properties" );
-            prb.load( resourceAsStream );
+            if (resourceAsStream != null) {
+                prb.load( resourceAsStream );
+            }
         }
         catch ( IOException e )
         {
diff --git a/core/src/main/java/org/jivesoftware/resource/SoundsRes.java b/core/src/main/java/org/jivesoftware/resource/SoundsRes.java
index 4eb2ad64..3e18832b 100644
--- a/core/src/main/java/org/jivesoftware/resource/SoundsRes.java
+++ b/core/src/main/java/org/jivesoftware/resource/SoundsRes.java
@@ -37,7 +37,9 @@ public class SoundsRes {
         try
         {
             InputStream resourceAsStream = cl.getResourceAsStream( "sounds.properties" );
-            prb.load( resourceAsStream );
+            if (resourceAsStream != null) {
+                prb.load( resourceAsStream );
+            }
         }
         catch ( IOException e )
         {
diff --git a/core/src/main/java/org/jivesoftware/resource/SparkRes.java b/core/src/main/java/org/jivesoftware/resource/SparkRes.java
index 79244915..d4086ee2 100644
--- a/core/src/main/java/org/jivesoftware/resource/SparkRes.java
+++ b/core/src/main/java/org/jivesoftware/resource/SparkRes.java
@@ -338,7 +338,9 @@ public class SparkRes {
         prb = new Properties();
         try {
             InputStream resourceAsStream = cl.getResourceAsStream("spark.properties");
-            prb.load(resourceAsStream);
+            if (resourceAsStream != null) {
+                prb.load(resourceAsStream);
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }