View | Details | Raw Unified | Return to bug 60199
Collapse All | Expand All

(-)java/org/apache/catalina/session/StandardSession.java (-9 / +4 lines)
Lines 16-28 Link Here
16 
 */
 16 
 */
17 
package org.apache.catalina.session;
 17 
package org.apache.catalina.session;
18 

          18
          

        

            

              
              
              19
              

            

        

          19
          
import java.beans.PropertyChangeSupport;

          20
          
import java.beans.PropertyChangeSupport;

        

        

          20
          
import java.io.IOException;

          21
          
import java.io.IOException;

        

        

          21
          
import java.io.NotSerializableException;

          22
          
import java.io.NotSerializableException;

        

        

          22
          
import java.io.ObjectInputStream;

          23
          
import java.io.ObjectInputStream;

        

        

          23
          
import java.io.ObjectOutputStream;

          24
          
import java.io.ObjectOutputStream;

        

        

          24
          
import java.io.Serializable;

          25
          
import java.io.Serializable;

        

            

              25
              
import java.io.WriteAbortedException;

              
              
            

        

          26
          
import java.security.AccessController;

          26
          
import java.security.AccessController;

        

        

          27
          
import java.security.Principal;

          27
          
import java.security.Principal;

        

        

          28
          
import java.security.PrivilegedAction;

          28
          
import java.security.PrivilegedAction;

        

  

    
      
            Lines 38-44
          
      
      
        Link Here
      
    
  

        

          38
          
import java.util.concurrent.ConcurrentHashMap;

          38
          
import java.util.concurrent.ConcurrentHashMap;

        

        

          39
          
import java.util.concurrent.ConcurrentMap;

          39
          
import java.util.concurrent.ConcurrentMap;

        

        

          40
          
import java.util.concurrent.atomic.AtomicInteger;

          40
          
import java.util.concurrent.atomic.AtomicInteger;

        

            

              41
              

              
              
            

        

          42
          
import javax.servlet.ServletContext;

          41
          
import javax.servlet.ServletContext;

        

        

          43
          
import javax.servlet.http.HttpSession;

          42
          
import javax.servlet.http.HttpSession;

        

        

          44
          
import javax.servlet.http.HttpSessionActivationListener;

          43
          
import javax.servlet.http.HttpSessionActivationListener;

        

  

    
      
            Lines 48-54
          
      
      
        Link Here
      
    
  

        

          48
          
import javax.servlet.http.HttpSessionEvent;

          47
          
import javax.servlet.http.HttpSessionEvent;

        

        

          49
          
import javax.servlet.http.HttpSessionIdListener;

          48
          
import javax.servlet.http.HttpSessionIdListener;

        

        

          50
          
import javax.servlet.http.HttpSessionListener;

          49
          
import javax.servlet.http.HttpSessionListener;

        

            

              51
              

              
              
            

        

          52
          
import org.apache.catalina.Context;

          50
          
import org.apache.catalina.Context;

        

        

          53
          
import org.apache.catalina.Globals;

          51
          
import org.apache.catalina.Globals;

        

        

          54
          
import org.apache.catalina.Manager;

          52
          
import org.apache.catalina.Manager;

        

  

    
      
            Lines 1622-1633
          
      
      
        Link Here
      
    
  

        

          1622
          
            final Object value;

          1620
          
            final Object value;

        

        

          1623
          
            try {

          1621
          
            try {

        

        

          1624
          
                value = stream.readObject();

          1622
          
                value = stream.readObject();

        

          
            

              1625
              
            } catch (WriteAbortedException wae) {


              1623
              
            } catch (Exception ex) {

            

            

              1626
              
                if (wae.getCause() instanceof NotSerializableException) {


              1624
              
                throw new IOException(String.format(

            

            

              1627
              
                    // Skip non serializable attributes


              1625
              
                        "Can't deserialize the value of the attribute '%s'.", name), ex);

            

            

              1628
              
                    continue;


              
              
            

            

              1629
              
                }


            

            

              1630
              
                throw wae;


            

        

          1631
          
            }

          1626
          
            }

        

        

          1632
          
            if (manager.getContext().getLogger().isDebugEnabled())

          1627
          
            if (manager.getContext().getLogger().isDebugEnabled())

        

        

          1633
          
                manager.getContext().getLogger().debug("  loading attribute '" + name +

          1628
          
                manager.getContext().getLogger().debug("  loading attribute '" + name +

        






  

  Return to bug 60199