svn commit: r1406154 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java

[lukaszlenart]

Author: lukaszlenart
Date: Tue Nov  6 14:44:10 2012
New Revision: 1406154

URL: http://svn.apache.org/viewvc?rev=1406154&view=rev
Log:
Does minor code refactoring and adds some additional logging

Modified:
    
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java?rev=1406154&r1=1406153&r2=1406154&view=diff
==============================================================================
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
 Tue Nov  6 14:44:10 2012
@@ -19,12 +19,12 @@ public class DefaultFileManagerFactory i
     private static final Logger LOG = 
LoggerFactory.getLogger(DefaultFileManagerFactory.class);
 
     private boolean reloadingConfigs;
-    private FileManager fileManager;
+    private FileManager systemFileManager;
     private Container container;
 
     @Inject(value = "system")
     public void setFileManager(FileManager fileManager) {
-        this.fileManager = fileManager;
+        this.systemFileManager = fileManager;
     }
 
     @Inject
@@ -38,6 +38,22 @@ public class DefaultFileManagerFactory i
     }
 
     public FileManager getFileManager() {
+        FileManager fileManager = lookupFileManager();
+        if (fileManager != null) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Using FileManager implementation [#0]", 
fileManager.getClass().getSimpleName());
+            }
+            fileManager.setReloadingConfigs(reloadingConfigs);
+            return fileManager;
+        }
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Using default implementation of FileManager provided 
under name [system]: #0", systemFileManager.getClass().getSimpleName());
+        }
+        systemFileManager.setReloadingConfigs(reloadingConfigs);
+        return systemFileManager;
+    }
+
+    private FileManager lookupFileManager() {
         Set<String> names = container.getInstanceNames(FileManager.class);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Found following implementations of FileManager 
interface: #0", names.toString());
@@ -57,7 +73,6 @@ public class DefaultFileManagerFactory i
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("Using FileManager implementation [#0]", 
fm.getClass().getSimpleName());
                 }
-                fm.setReloadingConfigs(reloadingConfigs);
                 return fm;
             }
         }
@@ -69,11 +84,7 @@ public class DefaultFileManagerFactory i
                 return fm;
             }
         }
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Using default implementation of FileManager provided 
under name [system]: #0", fileManager.getClass().getSimpleName());
-        }
-        fileManager.setReloadingConfigs(reloadingConfigs);
-        return fileManager;
+        return null;
     }
 
 }