From 1716e17841cca9fc16976613a04866406b077ae9 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 5 Nov 2012 20:04:35 +0000
Subject: [PATCH] WW-3914 solves problem with returning always system
 implementation of FileManager

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1405930 13f79535-47bb-0310-9956-ffa450edef68
---
 .../xwork2/util/fs/DefaultFileManagerFactory.java         | 8 +++-----
 .../xwork2/util/fs/DefaultFileManagerFactoryTest.java     | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
index 7e934fe5e..d705ade10 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactory.java
@@ -56,11 +56,9 @@ public class DefaultFileManagerFactory implements FileManagerFactory {
         if (LOG.isDebugEnabled()) {
             LOG.debug("No user defined FileManager, looking up for internal implementations!");
         }
-        if (fileManager == null) {
-            for (FileManager fm : internals) {
-                if (fm.support()) {
-                    return fm;
-                }
+        for (FileManager fm : internals) {
+            if (fm.support()) {
+                return fm;
             }
         }
         if (LOG.isDebugEnabled()) {
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
index bf061d75e..0868709b6 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/util/fs/DefaultFileManagerFactoryTest.java
@@ -35,6 +35,7 @@ public class DefaultFileManagerFactoryTest extends XWorkTestCase {
         // given
         fileManager = new DummyFileManager();
         DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
+        factory.setFileManager(new DefaultFileManager());
         factory.setContainer(new DummyContainer());
 
         // when