SPARK-2357: Don't consider every file ending with jpeg to be an image

Fixes an obvious mistake with file name handling.

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 )
         {

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 )
         {
@@ -181,7 +183,8 @@ public class Default {
     }
 
     public static boolean getBoolean(String propertyName) {
-	return getString(propertyName).replace(" ","").equals("true");
+        String prop = getString(propertyName);
+        return prop != null && Boolean.parseBoolean(prop.trim());
     }
 
     public static ImageIcon getImageIcon(String imageName) {

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 )
         {

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();
         }
@@ -377,7 +379,7 @@ public class SparkRes {
         while (enumeration.hasMoreElements()) {
             String token = enumeration.nextElement();
             String value = prb.getProperty(token).toLowerCase();
-            if (value.endsWith(".gif") || value.endsWith(".png") || value.endsWith(".jpg") || value.endsWith("jpeg")) {
+            if (value.endsWith(".gif") || value.endsWith(".png") || value.endsWith(".jpg") || value.endsWith(".jpeg")) {
                 SparkRes.getImageIcon(token);
             }
             String str = "public static final String " + token + " = \"" + token + "\";\n";

plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/FormUtils.java

@@ -51,7 +51,7 @@ final public class FormUtils {
      *         otherwise.
      */
     public static boolean isTrue(String str) {
-        return (str != null && str.equalsIgnoreCase("true"));
+        return Boolean.parseBoolean(str);
     }
 
 

plugins/sip/src/main/java/net/java/sipmack/common/Log.java

@@ -19,18 +19,9 @@ package net.java.sipmack.common;
 /**
  * Creates and writes out messages.
  */
-
 public class Log {
 
-    private static boolean debugger = false;
+    private static boolean debugger = Boolean.parseBoolean(System.getProperty("debugger"));
-
-    static {
-
-        if (System.getProperty("debugger") != null
-                && System.getProperty("debugger").equals("true"))
-            debugger = true;
-
-    }
 
     public static void debug(String message) {
         if (debugger)