From 5e0877dd4fc534db01da537197367b4efb60c385 Mon Sep 17 00:00:00 2001
From: Drew Short <nerian.drew@gmail.com>
Date: Tue, 28 Jan 2014 20:29:15 -0600
Subject: [PATCH] Fixed a cache usage issue and a logging issue

---
 .../java/com/sothr/imagetools/AppConfig.java  | 90 ++++++++++---------
 .../scala/com/sothr/imagetools/Engine.scala   |  2 +-
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/sothr/imagetools/AppConfig.java b/src/main/java/com/sothr/imagetools/AppConfig.java
index 8a717b0..84e0dd5 100644
--- a/src/main/java/com/sothr/imagetools/AppConfig.java
+++ b/src/main/java/com/sothr/imagetools/AppConfig.java
@@ -13,47 +13,57 @@ import java.util.Properties;
 
 public class AppConfig {
 
-    private static Logger logger;
-    public static CacheManager cacheManager;
-
-    //Logging defaults
-    private static final String LOGSETTINGSFILE = "./log4j.properties";
-    private static Boolean configuredLogging = false;
-
-    //Properties defaults
-    private static final String DEFAULTPROPERTIESFILE = "default.properties";
-    private static final String USERPROPERTIESFILE = "./config.xml";
-    private static Boolean loadedProperties = false;
-
-    //Cache defaults
-    private static Boolean configuredCache = false;
-
-    public static void configureApp() {
-      //configSimpleLogging();
-      if (!configuredLogging) {
-        BasicConfigurator.configure();
-        loadProperties();
-        BasicConfigurator.resetConfiguration();
-      } else {
-        loadProperties();
-      }
-      configLogging();
-      configCache();
+  private static Logger logger;
+  public static CacheManager cacheManager;
+
+  //Logging defaults
+  private static final String LOGSETTINGSFILE = "./log4j.properties";
+  private static Boolean configuredLogging = false;
+
+  //Properties defaults
+  private static final String DEFAULTPROPERTIESFILE = "default.properties";
+  private static final String USERPROPERTIESFILE = "./config.xml";
+  private static Boolean loadedProperties = false;
+
+  //Cache defaults
+  private static Boolean configuredCache = false;
+
+  public static void configureApp() {
+    //configSimpleLogging();
+    if (!configuredLogging) {
+      configBasicLogging();
+      loadProperties();
+      resetBasicLogging();
+    } else {
+      loadProperties();
     }
+    configLogging();
+    configCache();
+  }
 
-    public static void configLogging(String location) {
-      //Logging Config
-      //remove previous configuration if it exists
-      //BasicConfigurator.resetConfiguration();
-      File file = new File(location);
-      Boolean fromFile = false;
-      if (file.exists()) {
-        fromFile = true;
-        PropertyConfigurator.configure(location);
-      } else {
-        //Simple error logging configuration
-        Properties defaultProps = new Properties();
-        String rootLogger = "DEBUG";
+  public static void configBasicLogging() {
+    BasicConfigurator.configure();
+    logger = LoggerFactory.getLogger(AppConfig.class);
+  }
+
+  public static void resetBasicLogging() {
+    logger = null;
+    BasicConfigurator.resetConfiguration();
+  }
+
+  public static void configLogging(String location) {
+    //Logging Config
+    //remove previous configuration if it exists
+    //BasicConfigurator.resetConfiguration();
+    File file = new File(location);
+    Boolean fromFile = false;
+    if (file.exists()) {
+      fromFile = true;
+      PropertyConfigurator.configure(location);
+    } else {
+      //Simple error logging configuration
+      Properties defaultProps = new Properties();
+      String rootLogger = "DEBUG";
       if (Boolean.valueOf(PropertiesService.get(PropertiesEnum.LogDebug().toString()))) {
         //Rolling Debug logger
         rootLogger += ", DL";
@@ -114,7 +124,7 @@ public class AppConfig {
         PropertiesService.loadProperties(DEFAULTPROPERTIESFILE, null);
       }
       loadedProperties = true;
-      logger.info("Loaded properties");
+      logger.info("Loaded Properties");
     }
   }
 
diff --git a/src/main/scala/com/sothr/imagetools/Engine.scala b/src/main/scala/com/sothr/imagetools/Engine.scala
index d49e390..2f27e73 100644
--- a/src/main/scala/com/sothr/imagetools/Engine.scala
+++ b/src/main/scala/com/sothr/imagetools/Engine.scala
@@ -23,7 +23,7 @@ class Engine() extends Logging{
       debug(s"Found ${files.length} files that are images in directory: $directoryPath")
       for (file <- files) {
         if (imageCache.isKeyInCache(file.getAbsolutePath)) {
-          images += imageCache.get(file.getAbsolutePath).asInstanceOf[Image]
+          images += imageCache.get(file.getAbsolutePath).getObjectValue.asInstanceOf[Image]
         } else {
           val image = ImageService.getImage(file)
           imageCache.put(new Element(file.getAbsolutePath, image))