[hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/render HMathRenderEngine.java,1.1,1.2

[Klaus H. <js...@us...>]

Update of /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/render
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32636/WEB-INF/src/org/hartmath/server/render

Modified Files:
	HMathRenderEngine.java 
Log Message:
misc changes


Index: HMathRenderEngine.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/render/HMathRenderEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HMathRenderEngine.java	25 Apr 2004 18:55:56 -0000	1.1
--- HMathRenderEngine.java	2 May 2004 12:43:07 -0000	1.2
***************
*** 25,29 ****
  import javax.servlet.http.HttpServletRequest;
  
! import org.hartmath.server.cache.CachedPageCompiler;
  
  import org.hartmath.server.cache.CachedPage;
--- 25,29 ----
  import javax.servlet.http.HttpServletRequest;
  
! import org.hartmath.server.cache.CachedPageGenerator;
  
  import org.hartmath.server.cache.CachedPage;
***************
*** 150,162 ****
      String versionName = name+ snip.getVersion();
      
!     CachedPage cachedPage = (CachedPage) CachedPageCompiler.PAGE_MAP.get(versionName);
      if (cachedPage == null) {
        versionName = name+ (snip.getVersion()-1);
!       cachedPage = (CachedPage) CachedPageCompiler.PAGE_MAP.get(versionName);
        if (cachedPage != null) {
          // delete previous version
  //        System.out.println("remove:"+versionName);
!         synchronized (CachedPageCompiler.PAGE_MAP){
!           CachedPageCompiler.PAGE_MAP.remove(versionName);
          }
        }
--- 150,162 ----
      String versionName = name+ snip.getVersion();
      
!     CachedPage cachedPage = (CachedPage) CachedPageGenerator.PAGE_MAP.get(versionName);
      if (cachedPage == null) {
        versionName = name+ (snip.getVersion()-1);
!       cachedPage = (CachedPage) CachedPageGenerator.PAGE_MAP.get(versionName);
        if (cachedPage != null) {
          // delete previous version
  //        System.out.println("remove:"+versionName);
!         synchronized (CachedPageGenerator.PAGE_MAP){
!           CachedPageGenerator.PAGE_MAP.remove(versionName);
          }
        }
***************
*** 172,176 ****
  
      // create a new class:
!     CachedPageCompiler compiler = new CachedPageCompiler("P" + Long.toString(CachedPageCompiler.CLASS_COUNTER));
  
      String result = f.filter(content, filterContext, macros, compiler, 0);
--- 172,176 ----
  
      // create a new class:
!     CachedPageGenerator compiler = new CachedPageGenerator("P" + Long.toString(CachedPageGenerator.CLASS_COUNTER));
  
      String result = f.filter(content, filterContext, macros, compiler, 0);
***************
*** 179,184 ****
        versionName = name+ snip.getVersion();
  //      System.out.println("put:"+versionName);
!       synchronized (CachedPageCompiler.PAGE_MAP){
!         CachedPageCompiler.PAGE_MAP.put(versionName, cachedPage);
        }
        return cachedPage.filter(filterContext, macros);
--- 179,184 ----
        versionName = name+ snip.getVersion();
  //      System.out.println("put:"+versionName);
!       synchronized (CachedPageGenerator.PAGE_MAP){
!         CachedPageGenerator.PAGE_MAP.put(versionName, cachedPage);
        }
        return cachedPage.filter(filterContext, macros);