Backport of revision 1.10 changes into 2.2 branch:
Remove the static attribute to some variables which are accessed from
non-static context and should not be shared between instances of the
Tool.
Found by Peter Courcoux <peter@courcoux.biz>
git-svn-id: https://svn.apache.org/repos/asf/jakarta/turbine/core/branches/TURBINE_2_2_BRANCH@221609 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/turbine/services/pull/util/UIManager.java b/src/java/org/apache/turbine/services/pull/util/UIManager.java
index 46251b4..da85d74 100644
--- a/src/java/org/apache/turbine/services/pull/util/UIManager.java
+++ b/src/java/org/apache/turbine/services/pull/util/UIManager.java
@@ -147,7 +147,7 @@
/**
* The skins directory.
*/
- private static String skinsDirectory;
+ private String skinsDirectory;
/**
* The file within the skin directory that actually
@@ -165,13 +165,13 @@
* webapp context. Used for constructing correct
* URIs for retrieving images in image().
*/
- private static String resourcesDirectory;
+ private String resourcesDirectory;
/**
* Properties to hold the name/value pairs
* for the skin.
*/
- private static Properties skinProperties;
+ private Properties skinProperties;
/**
* Initialize the UIManager object.