[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info ...

[Julien Viet]

  User: julien  
  Date: 06/08/01 09:57:44

  Modified:    portlet/src/main/org/jboss/portal/portlet/container/info 
                        ContainerCacheInfo.java
  Log:
  - cms fixes
  - correct handling of -1 caching
  
  Revision  Changes    Path
  1.5       +15 -6     jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ContainerCacheInfo.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ContainerCacheInfo.java	18 Jun 2006 03:25:09 -0000	1.4
  +++ ContainerCacheInfo.java	1 Aug 2006 13:57:44 -0000	1.5
  @@ -25,16 +25,20 @@
   import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
   import org.jboss.portal.portlet.impl.jsr168.metadata.CacheConfigMetaData;
   import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
  +import org.apache.log4j.Logger;
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class ContainerCacheInfo implements CacheInfo
   {
   
      /** . */
  -   private int expirationTimeMillis;
  +   private static Logger log = Logger.getLogger(ContainerCacheInfo.class);
  +
  +   /** . */
  +   private int expirationTimeSecs;
   
      /** . */
      private int referenceType;
  @@ -44,11 +48,16 @@
         CacheConfigMetaData cacheConfigMD = portletMD.getCacheConfig();
         if (cacheConfigMD != null)
         {
  -         expirationTimeMillis = cacheConfigMD.getExpirationTimeMillis();
  +         expirationTimeSecs = cacheConfigMD.getExpirationTime();
  +         if (expirationTimeSecs < 0 && expirationTimeSecs != -1)
  +         {
  +            log.warn("Seen bad caching expiration value " + expirationTimeSecs + " disable caching instead");
  +            expirationTimeSecs = 0;
  +         }
         }
         else
         {
  -         expirationTimeMillis = 0;
  +         expirationTimeSecs = 0;
         }
   
         referenceType = REF_STRONG;
  @@ -58,9 +67,9 @@
         }
      }
   
  -   public int getExpirationMillis()
  +   public int getExpirationSecs()
      {
  -      return expirationTimeMillis;
  +      return expirationTimeSecs;
      }
   
      public int getReferenceType()