Properties load IO fix

Author: malaqueueit

QueueIT.Security/src/queueit/security/CookieValidateResultRepository.java

@@ -22,21 +22,17 @@ public class CookieValidateResultRepository extends ValidateResultRepositoryBase
     }
 
     private static void loadConfiguration()
-    {
+    { 
         try {
             // Load the properties
-            Properties props = new Properties();
-            ClassLoader classLoader = CookieValidateResultRepository.class.getClassLoader();     
-            InputStream configFile = classLoader.getResourceAsStream("queueit.properties");
-            if (configFile != null) {
-                props.load(configFile);
-                defaultCookieDomain = props.getProperty("cookieDomain", null);
-                defaultCookieExpiration =  Integer.parseInt(props.getProperty("cookieExpiration", "1200"));
-            }
+            Properties props = QueueitProperties.getProperties("queueit.properties");
+            defaultCookieDomain = props.getProperty("cookieDomain", null);
+            defaultCookieExpiration =  Integer.parseInt(props.getProperty("cookieExpiration", "1200"));
         } catch (Exception e) {
             // no need to handle exception
-        }      
+        }    
     }
+    
     @Override
     public IValidateResult getValidationResult(IQueue queue) {
 

QueueIT.Security/src/queueit/security/KnownUserFactory.java

@@ -32,18 +32,12 @@ private static void loadConfiguration()
     {
         try {
             // Load the properties
-            Properties props = new Properties();
-            ClassLoader classLoader = KnownUserFactory.class.getClassLoader();     
-            InputStream configFile = classLoader.getResourceAsStream("queueit.properties");
-            if (configFile != null) {
-                props.load(configFile);
-                defaultSecretKey = props.getProperty("secretKey", null);
-                defaultQuerystringPrefix = props.getProperty("queryStringPrefix", null);
-            }
+            Properties props = QueueitProperties.getProperties("queueit.properties");
+            defaultSecretKey = props.getProperty("secretKey", null);
+            defaultQuerystringPrefix = props.getProperty("queryStringPrefix", null);
         } catch (Exception e) {
-            String x = e.getMessage();
-            // Handle exception as needed
-        }      
+            // Ignore
+        }        
     }
 
     public static void configure(String sharedEventKey) {

QueueIT.Security/src/queueit/security/QueueFactory.java

@@ -32,13 +32,7 @@ public static IQueue createQueue(String queueName)
         String fileName = "queueit-" + queueName + ".properties";
         try {
             // Load the properties
-            Properties props = new Properties();
-            ClassLoader classLoader = KnownUserFactory.class.getClassLoader();     
-            InputStream configFile = classLoader.getResourceAsStream(fileName);
-            if (configFile == null) {
-                throw new IllegalArgumentException("Properties file '" + fileName + "' not found in classpath");
-            }
-            props.load(configFile);
+            Properties props = QueueitProperties.getProperties(fileName);
 
             String landingPage = props.getProperty("landingPage", null);
             String language = props.getProperty("language", null);

QueueIT.Security/src/queueit/security/QueueitProperties.java

@@ -0,0 +1,51 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package queueit.security;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ *
+ * @author mala_000
+ */
+public class QueueitProperties {
+    
+    private static Map<String, Properties> properties = new HashMap<String, Properties>(); 
+    
+    public static Properties getProperties(String id) throws IOException {
+        if (!properties.containsKey(id)) {
+        
+            InputStream configFile = null;
+        
+            try {
+                // Load the properties
+                Properties props = new Properties();
+                ClassLoader classLoader = QueueitProperties.class.getClassLoader();     
+                configFile = classLoader.getResourceAsStream(id);
+                if (configFile == null) {
+                    throw new IOException("Config file '" + id + "' was not loaded");
+                }
+
+                props.load(configFile);
+                properties.put(id, props);
+            } 
+            finally {
+                if (configFile != null) {
+                    try {
+                        configFile.close();
+                    } catch(Exception ex) {
+                       //ignore
+                    }
+                }         
+            }
+        }
+        
+        return properties.get(id);
+    }
+}

QueueIT.Security/src/queueit/security/SessionValidationController.java

@@ -370,16 +370,11 @@ private static IValidateResult validateRequest(
         }
     }
 
-    private static void loadConfiguration() {
+    private static void loadConfiguration() {       
         try {
             // Load the properties
-            Properties props = new Properties();
-            ClassLoader classLoader = KnownUserFactory.class.getClassLoader();
-            InputStream configFile = classLoader.getResourceAsStream("queueit.properties");
-            if (configFile != null) {
-                props.load(configFile);
-                defaultTicketExpiration = Integer.parseInt(props.getProperty("ticketExpiration", "180"));
-            }
+            Properties props = QueueitProperties.getProperties("queueit.properties");
+            defaultTicketExpiration = Integer.parseInt(props.getProperty("ticketExpiration", "180"));
         } catch (Exception e) {
             // ignore
         }