Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-22 17:20:58 +00:00
parent ea740e26bf
commit 9189208bad
11 changed files with 54 additions and 260 deletions

View File

@@ -62,7 +62,7 @@ public class Application
public static final String MESSAGE_BUNDLE = "alfresco.messages.webclient";
private static boolean inPortalServer = false;
private static ThreadLocal<Boolean> inPortalServer = new ThreadLocal<Boolean>();
private static StoreRef repoStoreRef;
private static String rootPath;
private static String companyRootId;
@@ -87,7 +87,7 @@ public class Application
*/
public static void setInPortalServer(boolean inPortal)
{
inPortalServer = inPortal;
inPortalServer.set(inPortal);
}
/**
@@ -97,7 +97,7 @@ public class Application
*/
public static boolean inPortalServer()
{
return inPortalServer;
return (inPortalServer.get() != null ? inPortalServer.get() : false);
}
/**