cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow ContinuationsManagerImpl.java WebContinuation.java
Date Mon, 17 May 2004 18:50:54 GMT
vgritsenko    2004/05/17 11:50:54

  Modified:    src/java/org/apache/cocoon/components/flow
                        ContinuationsManagerImpl.java WebContinuation.java
  Log:
  minor changes, clean up
  
  Revision  Changes    Path
  1.11      +15 -18    cocoon-2.1/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
  
  Index: ContinuationsManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ContinuationsManagerImpl.java	9 Apr 2004 19:52:54 -0000	1.10
  +++ ContinuationsManagerImpl.java	17 May 2004 18:50:53 -0000	1.11
  @@ -97,6 +97,13 @@
           bytes = new byte[CONTINUATION_ID_LENGTH];
       }
   
  +    /**
  +     * Get the command sink so that we can be notified of changes
  +     */
  +    public void contextualize(Context context) throws ContextException {
  +        m_commandSink = (Sink) context.get(Queue.ROLE);
  +    }
  +
       public void configure(Configuration config) {
           defaultTimeToLive = config.getAttributeAsInteger("time-to-live", (3600 * 1000));
           Configuration expireConf = config.getChild("expirations-check");
  @@ -122,13 +129,11 @@
   
           if (parent == null) {
               forrest.add(wk);
  -        }
  -
  -        // REVISIT: This Places only the "leaf" nodes in the expirations Sorted Set.
  -        // do we really want to do this?
  -        if (parent != null) {
  -            if (wk.getParentContinuation().getChildren().size() < 2) {
  -                expirations.remove(wk.getParentContinuation());
  +        } else {
  +            // REVISIT: This places only the "leaf" nodes in the expirations Sorted Set.
  +            // do we really want to do this?
  +            if (parent.getChildren().size() < 2) {
  +                expirations.remove(parent);
               }
           }
   
  @@ -312,13 +317,12 @@
               getLogger().debug("WK: Forrest size: " + forrest.size());
               displayAllContinuations();
               displayExpireSet();
  -        }
   
  -        // clean up
  -        if (getLogger().isDebugEnabled()) {
               getLogger().debug("WK CurrentSystemTime[" + System.currentTimeMillis() +
                                 "]: Cleaning up expired Continuations....");
           }
  +
  +        // clean up
           WebContinuation wk;
           Iterator iter = expirations.iterator();
           while (iter.hasNext() && ((wk = (WebContinuation) iter.next()).hasExpired()))
{
  @@ -332,13 +336,6 @@
               displayAllContinuations();
               displayExpireSet();
           }
  -    }
  -
  -    /**
  -     * Get the command sink so that we can be notified of changes
  -     */
  -    public void contextualize(Context context) throws ContextException {
  -        m_commandSink = (Sink) context.get(Queue.ROLE);
       }
   
   
  
  
  
  1.9       +2 -2      cocoon-2.1/src/java/org/apache/cocoon/components/flow/WebContinuation.java
  
  Index: WebContinuation.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/WebContinuation.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebContinuation.java	9 Apr 2004 19:52:54 -0000	1.8
  +++ WebContinuation.java	17 May 2004 18:50:53 -0000	1.9
  @@ -350,7 +350,7 @@
        * Dispose this continuation. Should be called on invalidation.
        */
       public void dispose() {
  -        // Call specific possible implementation-specific clean-up on this continuation.
  +        // Call possible implementation-specific clean-up on this continuation.
           if (this.disposer != null) {
               this.disposer.disposeContinuation(this);
           }
  
  
  

Mime
View raw message