0001997: Excessive logging from PropertiesFactoryBean

JumpMind · Oct 7, 2014 · a1907d3 · a1907d3
1 parent f290698
commit a1907d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java
@@ -61,6 +61,7 @@
 import org.jumpmind.symmetric.job.IJobManager;
 import org.jumpmind.symmetric.job.JobManager;
 import org.jumpmind.symmetric.util.LogSummaryAppenderUtils;
+import org.jumpmind.symmetric.util.PropertiesFactoryBean;
 import org.jumpmind.symmetric.util.SnapshotUtil;
 import org.jumpmind.util.AppUtils;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
@@ -386,27 +387,6 @@ protected Resource[] buildLocations(File propertiesFile) {
         };
     }
 
-    protected static class PropertiesFactoryBean extends
-            org.springframework.beans.factory.config.PropertiesFactoryBean {
-
-        private static Properties localProperties;
-
-        public PropertiesFactoryBean() {
-            this.setLocalOverride(true);
-            if (localProperties != null) {
-                this.setProperties(localProperties);
-            }
-        }
-
-        public static void setLocalProperties(Properties localProperties) {
-            PropertiesFactoryBean.localProperties = localProperties;
-        }
-
-        public static void clearLocalProperties() {
-            PropertiesFactoryBean.localProperties = null;
-        }
-    }
-
     @Override
     public synchronized void destroy() {
         super.destroy();

diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/util/PropertiesFactoryBean.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/util/PropertiesFactoryBean.java
@@ -0,0 +1,10 @@
+package org.jumpmind.symmetric.util;
+
+public class PropertiesFactoryBean extends
+        org.springframework.beans.factory.config.PropertiesFactoryBean {
+
+    public PropertiesFactoryBean() {
+        this.setLocalOverride(true);
+    }
+
+}