cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine sunshine-act.xmap
Date Tue, 23 Apr 2002 08:01:24 GMT
cziegeler    02/04/23 01:01:24

  Modified:    src/java/org/apache/cocoon/webapps/portal/components
                        PortalManager.java
               src/scratchpad/src/org/apache/cocoon/sunshine
                        sunshine-act.xmap
  Log:
  Fixing portal demo
  
  Revision  Changes    Path
  1.3       +7 -5      xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/PortalManager.java
  
  Index: PortalManager.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/PortalManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortalManager.java	19 Apr 2002 11:02:58 -0000	1.2
  +++ PortalManager.java	23 Apr 2002 08:01:23 -0000	1.3
  @@ -105,7 +105,7 @@
    *  This is the basis portal component
    *
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  - * @version CVS $Id: PortalManager.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
  + * @version CVS $Id: PortalManager.java,v 1.3 2002/04/23 08:01:23 cziegeler Exp $
   */
   public final class PortalManager
   extends AbstractSessionComponent {
  @@ -190,10 +190,12 @@
        */
       public void recycle() {
           super.recycle();
  -        this.manager.release(this.profileStore);
  -        this.profileStore = null;
  -        this.manager.release(this.authenticationManager);
  -        this.authenticationManager = null;
  +        if (this.manager != null) {
  +            this.manager.release(this.profileStore);
  +            this.manager.release(this.authenticationManager);
  +            this.profileStore = null;
  +            this.authenticationManager = null;
  +        }
       }
   
       /**
  
  
  
  1.4       +1 -1      xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunshine-act.xmap
  
  Index: sunshine-act.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/sunshine-act.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sunshine-act.xmap	18 Apr 2002 08:17:29 -0000	1.3
  +++ sunshine-act.xmap	23 Apr 2002 08:01:24 -0000	1.4
  @@ -15,7 +15,7 @@
   		<delete-user uri="cocoon:raw://sunspotdemoresource-sunrise-deluser"/>
   		<applications>
   			<application loadondemand="true" name="sunspotdemo">
  -				<configuration name="sunSpot">
  +				<configuration name="portal">
   					<auth-redirect>sunspotdemo-portal</auth-redirect>
   					<portal-uri>sunspotdemo-portal</portal-uri>
   					<profile-cache>true</profile-cache>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message