[jboss-cvs] jboss-portal/cms/src/main/org/jboss/portal/cms/impl/cache ...

[Julien Viet]

  User: julien  
  Date: 06/07/11 16:50:26

  Modified:    cms/src/main/org/jboss/portal/cms/impl/cache 
                        CMSTreeCacheServiceImpl.java
  Log:
  - make cms cache work
  - improve portal object deployment in ha mode
  
  Revision  Changes    Path
  1.3       +33 -1     jboss-portal/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CMSTreeCacheServiceImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CMSTreeCacheServiceImpl.java	23 Jun 2006 08:52:19 -0000	1.2
  +++ CMSTreeCacheServiceImpl.java	11 Jul 2006 20:50:26 -0000	1.3
  @@ -34,7 +34,7 @@
   
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class CMSTreeCacheServiceImpl extends AbstractJBossService implements CMSTreeCacheService
   {
  @@ -62,6 +62,14 @@
      
      public File get(String path, Locale locale)
      {
  +      if (path == null)
  +      {
  +         throw new IllegalArgumentException("No null path accepted");
  +      }
  +      if (locale == null)
  +      {
  +         throw new IllegalArgumentException("No null locale accepted");
  +      }
         try
         {
            File file = (File)cache.get(path, locale);
  @@ -80,6 +88,18 @@
   
      public void put(String path, Locale locale, File file)
      {
  +      if (path == null)
  +      {
  +         throw new IllegalArgumentException("No null path accepted");
  +      }
  +      if (locale == null)
  +      {
  +         throw new IllegalArgumentException("No null locale accepted");
  +      }
  +      if (file == null)
  +      {
  +         throw new IllegalArgumentException("No null file accepted");
  +      }
         try
         {
            cache.put(path, locale, file);
  @@ -92,6 +112,14 @@
   
      public void remove(String path, Locale locale) throws CMSCacheException
      {
  +      if (path == null)
  +      {
  +         throw new IllegalArgumentException("No null path accepted");
  +      }
  +      if (locale == null)
  +      {
  +         throw new IllegalArgumentException("No null locale accepted");
  +      }
         try
         {
            cache.remove(path, locale);
  @@ -104,6 +132,10 @@
   
      public void remove(String path) throws CMSCacheException
      {
  +      if (path == null)
  +      {
  +         throw new IllegalArgumentException("No null path accepted");
  +      }
         try
         {
            cache.remove(path);