juergen 2002/08/13 06:00:34
Modified:
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
TProcessors.java
Log:
the user/pwd handling was not thread safe.
Revision Changes Path
1.37 +13 -20
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java
Index: TProcessors.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TProcessors.java 12 Aug 2002 15:41:24 -0000 1.36
+++ TProcessors.java 13 Aug 2002 13:00:34 -0000 1.37
@@ -105,11 +105,9 @@
/** user */
String defaultUser;
- String currentUser;
/** password */
String defaultPassword;
- String currentPassword;
/** url encoding */
@@ -150,8 +148,6 @@
port = System.getProperty("xdav.port");
defaultUser = System.getProperty("xdav.user");
defaultPassword = System.getProperty("xdav.password");
- currentUser = defaultUser;
- currentPassword = defaultPassword;
defaultUrlEncoding = System.getProperty("xdav.urlencoding");
tracingRequest = System.getProperty("xdav.tracingRequest", "none");
@@ -498,17 +494,20 @@
boolean result = false;
long time = System.currentTimeMillis();
HttpMethod method = null;
+
+ // initialise user and password
+ knownVariables.put("user", defaultUser);
+ knownVariables.put("password", defaultPassword);
assignVariables(elt.getChildren("assign"));
- currentUser = defaultUser;
- currentPassword = defaultPassword;
-
String user = replaceKnownVariable(elt.getChild("user"), defaultUser);
String password = replaceKnownVariable(elt.getChild("password"),
defaultPassword);
- currentUser = user;
- currentPassword = password;
+ // set user and password to the computed values
+ knownVariables.put("user", user);
+ knownVariables.put("password", password);
+
HttpClient client = new HttpClient();
WebdavState state = new WebdavState();
@@ -517,7 +516,7 @@
state.setURLEncodingCharset(defaultUrlEncoding);
client.startSession((String)startUp.get("host"),
((Integer)startUp.get("port") ).intValue(),
- new Credentials(currentUser, currentPassword));
+ new Credentials(user, password));
client.setState(state);
if (tracingRequest.indexOf("client") != (-1)) {
client.setDebug(100);
@@ -1558,12 +1557,6 @@
key.equals("port")||
key.equals("workdb") ) {
return System.getProperty("xdav." + key, "");
- }
- else if (key.equals("user")) {
- return currentUser;
- }
- else if (key.equals("password")) {
- return currentPassword;
}
else {
HashtableStack vars =
(HashtableStack)knownVarsByThread.get(Thread.currentThread().getName());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
