cvs commit: cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation PortalGenerator.java

[cziegeler]

cziegeler    2003/05/04 13:54:30

  Modified:    
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation
                        PortalGenerator.java
  Log:
  Fixing workaround
  
  Revision  Changes    Path
  1.3       +9 -9      
cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/PortalGenerator.java
  
  Index: PortalGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/generation/PortalGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PortalGenerator.java      4 May 2003 20:19:42 -0000       1.2
  +++ PortalGenerator.java      4 May 2003 20:54:29 -0000       1.3
  @@ -75,26 +75,26 @@
       throws IOException, SAXException, ProcessingException {
   
           PortalManager portal = null;
  +        FormManager formManager = null;
           try {
  +            // FIXME - workaround for form handling
  +            formManager = (FormManager)this.manager.lookup(FormManager.ROLE);
  +            // no need do to anything here with the form manager:)
  +
               portal = (PortalManager) this.manager.lookup(PortalManager.ROLE);
               this.xmlConsumer.startDocument();
   
               final Request request = 
ObjectModelHelper.getRequest(this.objectModel);
               if (request.getSession(false) != null) {
  -                // FIXME - workaround for form handling
  -                FormManager formManager = null;
  -                try {
  -                    formManager = 
(FormManager)this.manager.lookup(FormManager.ROLE);
  -                    // no need do to anything here :)
  -                } finally {
  -                    this.manager.release( (Component)formManager);
  -                }
  +
                   portal.showPortal(this.xmlConsumer, false, false);
  +
               }
               this.xmlConsumer.endDocument();
           } catch (ComponentException ce) {
               throw new ProcessingException("Lookup of PortalManager failed.", 
ce);
           } finally {
  +            this.manager.release( (Component)formManager);
               this.manager.release(portal);
           }
       }