[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging PagingUtils.java

[mguo]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging
In directory 
james.mmbase.org:/tmp/cvs-serv1926/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging

Modified Files:
        PagingUtils.java 
Log Message:
CMSC-996 fix thread local init problem.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging
See also: http://www.mmbase.org/jira/browse/CMSC-996


Index: PagingUtils.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/paging/PagingUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PagingUtils.java    30 Jul 2008 09:47:27 -0000      1.9
+++ PagingUtils.java    31 Jul 2008 05:01:25 -0000      1.10
@@ -4,15 +4,19 @@
 import org.mmbase.bridge.NodeQuery;
 import org.mmbase.bridge.util.Queries;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.PageContext;
-import java.util.Map;
 
 
 public class PagingUtils {
 
-   public static ThreadLocal<PagingStatusHolder> pagingStatusHolderLocal = new 
ThreadLocal<PagingStatusHolder>();
+   private static ThreadLocal<PagingStatusHolder> pool = new 
ThreadLocal<PagingStatusHolder>();
+
+
+   public static PagingStatusHolder getStatusHolder() {
+      return pool.get();
+   }
+
    public static final int DEFAULTPAGESIZE = 30;
    public static final int FIRSTPAGE = 1;
 
@@ -69,14 +73,6 @@
       return href(pagecontext, nextPage.toString()).toString();
    }
 
-   public static void savePagingStatus(ServletRequest request) {
-      Map paraMap = request.getParameterMap();
-
-//      threadLocal.set(paraMap);
-
-
-   }
-
    public static int getSystemPageSize() {
       return 30;
    }
@@ -92,10 +88,9 @@
    }
 
    public static void initStatusHolder(HttpServletRequest request) {
-      PagingStatusHolder holder = pagingStatusHolderLocal.get();
-      if (null == holder) {
-         holder = new PagingStatusHolder();
-      }
+      PagingStatusHolder holder = new PagingStatusHolder();
+      pool.set(holder);
+
 
       String page = request.getParameter("page");
       String sort = request.getParameter("sortby");
@@ -115,12 +110,6 @@
       if (StringUtils.isNotBlank(dir)) {
          holder.setDir(dir);
       }
-
-      pagingStatusHolderLocal.set(holder);
-   }
-
-   public static PagingStatusHolder getStatusHolder() {
-      return pagingStatusHolderLocal.get();
    }
 
    public static PagingStatusHolder getStatusHolderInSorting(String column, 
String direction) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs