fhanik      2004/01/14 20:19:50

  Modified:    modules/cluster/src/share/org/apache/catalina/cluster/session
                        DeltaManager.java
               modules/cluster/src/share/org/apache/catalina/cluster/tcp
                        PooledSocketSender.java
  Log:
  Implemented the ability to not expire sessions on shutdown, since that will expire 
them across the cluster.
  Catching if the socket sender has disappeared, avoiding nullpointer exception
  
  Revision  Changes    Path
  1.7       +18 -15    
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
  
  Index: DeltaManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DeltaManager.java 13 Jan 2004 05:26:59 -0000      1.6
  +++ DeltaManager.java 15 Jan 2004 04:19:50 -0000      1.7
  @@ -711,17 +711,20 @@
           started = false;
   
           // Expire all active sessions
  -        Session sessions[] = findSessions();
  -        for (int i = 0; i < sessions.length; i++) {
  -            DeltaSession session = (DeltaSession) sessions[i];
  -            if (!session.isValid())
  -                continue;
  -            try {
  -                session.expire();
  -            } catch (Throwable t) {
  -                ;
  -            }
  -        }
  +        if ( this.getExpireSessionsOnShutdown() ) {
  +            Session sessions[] = findSessions();
  +            for (int i = 0; i < sessions.length; i++) {
  +                DeltaSession session = (DeltaSession) sessions[i];
  +                if (!session.isValid())
  +                    continue;
  +                try {
  +                    session.expire();
  +                }
  +                catch (Throwable t) {
  +                    ;
  +                } //catch
  +            } //for
  +        }//end if
   
           // Require a new random number generator if we are restarted
           this.random = null;
  
  
  
  1.4       +5 -5      
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
  
  Index: PooledSocketSender.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PooledSocketSender.java   13 Jan 2004 05:46:21 -0000      1.3
  +++ PooledSocketSender.java   15 Jan 2004 04:19:50 -0000      1.4
  @@ -158,8 +158,8 @@
       {
           //get a socket sender from the pool
           SocketSender sender = senderQueue.getSender(0);
  -        if ( sender == null && isConnected() ) {
  -            log.warn("No socket sender available for 
client="+this.getAddress()+":"+this.getPort());
  +        if ( sender == null ) {
  +            log.warn("No socket sender available for 
client="+this.getAddress()+":"+this.getPort()+" did it disappear?");
               return;
           }//end if
           //send the message
  
  
  

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

Reply via email to