cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile BaseProfile.java

[raphael]

raphael     01/06/25 03:50:21

  Modified:    src/java/org/apache/jetspeed/om/profile BaseProfile.java
  Log:
  [fix] make sure PorletSet is always regenerated to ensure freshness
  when PSML is modified (there's a performance cost though)
  
  Revision  Changes    Path
  1.6       +3 -12     
jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfile.java
  
  Index: BaseProfile.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfile.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseProfile.java  2001/06/04 17:43:11     1.5
  +++ BaseProfile.java  2001/06/25 10:50:17     1.6
  @@ -65,7 +65,7 @@
   Provides base functionality within a Registry.
   
   @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
  -@version $Id: BaseProfile.java,v 1.5 2001/06/04 17:43:11 raphael Exp $
  +@version $Id: BaseProfile.java,v 1.6 2001/06/25 10:50:17 raphael Exp $
   */
   
   public class BaseProfile extends BaseInitable implements Profile
  @@ -77,7 +77,6 @@
       private String group = null;
       private String role = null;
       private PSMLDocument doc = null;
  -    private PortletSet set = null;
   
       public BaseProfile()
       {}
  @@ -109,15 +108,7 @@
        */
       public PortletSet getRootSet()
       {
  -        synchronized (this)
  -        {
  -            if (this.set == null)
  -            {
  -                this.set = PortalToolkit.getSet( getDocument().getPortlets() );
  -            }
  -        }
  -        
  -        return this.set;
  +        return PortalToolkit.getSet( getDocument().getPortlets() );
       }
   
       /**
  @@ -129,7 +120,7 @@
       {
           synchronized (this)
           {
  -            if (this.doc == null)
  +            if ((this.doc == null) || (this.doc.getPortlets() == null))
               {
                   this.doc = PsmlManager.getDocument(getURL());
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]