You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-dev@portals.apache.org by st...@apache.org on 2004/02/11 21:50:24 UTC
cvs commit: jakarta-pluto/container/src/java/org/apache/pluto PortletContainerServices.java
sthepper 2004/02/11 12:50:24
Modified: container/src/java/org/apache/pluto
PortletContainerServices.java
Log:
fixed type in stackLocale to stackLocal
Revision Changes Path
1.2 +11 -11 jakarta-pluto/container/src/java/org/apache/pluto/PortletContainerServices.java
Index: PortletContainerServices.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/PortletContainerServices.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletContainerServices.java 7 Jan 2004 20:37:22 -0000 1.1
+++ PortletContainerServices.java 11 Feb 2004 20:50:24 -0000 1.2
@@ -14,7 +14,7 @@
public static ContainerService get(Class service)
{
- // get current environment from thread locale
+ // get current environment from thread local
// after prepare has been called
Stack currentContainerServiceStack = (Stack)currentContainerService.get();
@@ -35,7 +35,7 @@
public static String getUniqueContainerName()
{
- // get uniqueContainerName stack out of the thread locale
+ // get uniqueContainerName stack out of the thread local
Stack currentNameStack = (Stack)currentUniqueContainerName.get();
if (currentNameStack.isEmpty())
@@ -68,14 +68,14 @@
*/
public static void prepare(String uniqueContainerName)
{
- // get container service stack out of the thread locale
+ // get container service stack out of the thread local
Stack currentContainerServiceStack = (Stack)currentContainerService.get();
- // add current environment to stack stored in thread locale
+ // add current environment to stack stored in thread local
currentContainerServiceStack.push(containerServices.get(uniqueContainerName));
- // get uniqueContainerName stack out of the thread locale
+ // get uniqueContainerName stack out of the thread local
Stack currentNameStack = (Stack)currentUniqueContainerName.get();
- // add current uniqueContainerName to stack stored in thread locale
+ // add current uniqueContainerName to stack stored in thread local
currentNameStack.push(uniqueContainerName);
}
@@ -84,7 +84,7 @@
*/
public static void release()
{
- // remove current environment from thread locale
+ // remove current environment from thread local
// after prepare has been called
Stack currentContainerServiceStack = (Stack)currentContainerService.get();
if (!currentContainerServiceStack.isEmpty())
@@ -92,7 +92,7 @@
currentContainerServiceStack.pop();
}
- // remove uniqueContainerName from thread locale
+ // remove uniqueContainerName from thread local
// after prepare has been called
Stack currentNameStack = (Stack)currentUniqueContainerName.get();
if (!currentNameStack.isEmpty())
@@ -102,16 +102,16 @@
}
// holds a stack of the current environments for temporary use
- private static ThreadLocal currentContainerService = new StackedThreadLocale();
+ private static ThreadLocal currentContainerService = new StackedThreadLocal();
// holds the current environment reference for temporary use
- private static ThreadLocal currentUniqueContainerName = new StackedThreadLocale();
+ private static ThreadLocal currentUniqueContainerName = new StackedThreadLocal();
// map of possible environments
private static HashMap containerServices = new HashMap();
- private static class StackedThreadLocale extends ThreadLocal
+ private static class StackedThreadLocal extends ThreadLocal
{
public Object initialValue()
{