inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect use of statics around the ApplicationContext

Browse Source 
- Application context will shut down and restart if a new different context is requested
 - Removed gratuitous use of statics and added necessary synchronization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-08-26 12:36:14 +00:00
parent 28dad9a7b5
commit 9c18bf6d7b
2 changed files with 104 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
View File

@@ -67,8 +67,7 @@ public abstract class BaseWebScriptTest extends TestCase
private boolean traceReqRes = false;
// Local Server access
private static String customContext = null;
private static TestWebScriptServer server = null;
private String customContext = null;
// Remote Server access
private String defaultRunAs = null;
@@ -156,9 +155,9 @@ public abstract class BaseWebScriptTest extends TestCase
* Sets custom context for Test Web Script Server (in-process only)
* @param customContext
*/
public static void setCustomContext(String customContext)
protected void setCustomContext(String customContext)
{
BaseWebScriptTest.customContext = customContext;
this.customContext = customContext;
}
/**
@@ -237,20 +236,19 @@ public abstract class BaseWebScriptTest extends TestCase
}
}
protected static TestWebScriptServer getServer()
/**
* Get the server for the previously-supplied {@link #setCustomContext(String) custom context}
*/
protected TestWebScriptServer getServer()
{
if (BaseWebScriptTest.server == null)
if (customContext == null)
{
if (BaseWebScriptTest.customContext == null)
{
BaseWebScriptTest.server = TestWebScriptRepoServer.getTestServer();
}
else
{
BaseWebScriptTest.server = TestWebScriptRepoServer.getTestServer(customContext);
}
return TestWebScriptRepoServer.getTestServer();
}
else
{
return TestWebScriptRepoServer.getTestServer(customContext);
}
return BaseWebScriptTest.server;
}
@@ -348,7 +346,7 @@ public abstract class BaseWebScriptTest extends TestCase
asUser = (asUser == null) ? defaultRunAs : asUser;
if (asUser == null)
{
return BaseWebScriptTest.getServer().submitRequest(req.getMethod(), req.getFullUri(), req.getHeaders(), req.getBody(), req.getEncoding(), req.getType());
return getServer().submitRequest(req.getMethod(), req.getFullUri(), req.getHeaders(), req.getBody(), req.getEncoding(), req.getType());
}
else
{
@@ -358,7 +356,7 @@ public abstract class BaseWebScriptTest extends TestCase
@SuppressWarnings("synthetic-access")
public Response doWork() throws Exception
{
return BaseWebScriptTest.getServer().submitRequest(req.getMethod(), req.getFullUri(), req.getHeaders(), req.getBody(), req.getEncoding(), req.getType());
return getServer().submitRequest(req.getMethod(), req.getFullUri(), req.getHeaders(), req.getBody(), req.getEncoding(), req.getType());
}
}, asUser);
}