Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 69038 invoked from network); 4 Feb 2009 11:44:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Feb 2009 11:44:31 -0000 Received: (qmail 29884 invoked by uid 500); 4 Feb 2009 11:44:24 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 29724 invoked by uid 500); 4 Feb 2009 11:44:24 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 29620 invoked by uid 99); 4 Feb 2009 11:44:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Feb 2009 03:44:23 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Feb 2009 11:44:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A06752388888; Wed, 4 Feb 2009 11:44:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r740701 - in /tomcat/trunk/java/org/apache/catalina/core: ContainerBase.java StandardContext.java Date: Wed, 04 Feb 2009 11:44:01 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090204114401.A06752388888@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Feb 4 11:44:00 2009 New Revision: 740701 URL: http://svn.apache.org/viewvc?rev=740701&view=rev Log: Remove serialization from Container. Old experiment that didn't work. Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=740701&r1=740700&r2=740701&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Feb 4 11:44:00 2009 @@ -22,7 +22,6 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.IOException; -import java.io.Serializable; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; @@ -121,7 +120,7 @@ */ public abstract class ContainerBase - implements Container, Lifecycle, Pipeline, MBeanRegistration, Serializable { + implements Container, Lifecycle, Pipeline, MBeanRegistration { private static org.apache.juli.logging.Log log= org.apache.juli.logging.LogFactory.getLog( ContainerBase.class ); @@ -1396,7 +1395,7 @@ protected String suffix; protected ObjectName oname; protected ObjectName controller; - protected transient MBeanServer mserver; + protected MBeanServer mserver; public ObjectName getJmxName() { return oname; Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=740701&r1=740700&r2=740701&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Feb 4 11:44:00 2009 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Hashtable; @@ -114,9 +113,9 @@ public class StandardContext extends ContainerBase - implements Context, Serializable, NotificationEmitter + implements Context, NotificationEmitter { - private static transient Log log = LogFactory.getLog(StandardContext.class); + private static Log log = LogFactory.getLog(StandardContext.class); // ----------------------------------------------------------- Constructors @@ -207,14 +206,14 @@ /** * The set of instantiated application event listener objects. */ - private transient Object applicationEventListenersObjects[] = + private Object applicationEventListenersObjects[] = new Object[0]; /** * The set of instantiated application lifecycle listener objects. */ - private transient Object applicationLifecycleListenersObjects[] = + private Object applicationLifecycleListenersObjects[] = new Object[0]; @@ -233,12 +232,12 @@ /** * The broadcaster that sends j2ee notifications. */ - private transient NotificationBroadcasterSupport broadcaster = null; + private NotificationBroadcasterSupport broadcaster = null; /** * The Locale to character set mapper for this application. */ - private transient CharsetMapper charsetMapper = null; + private CharsetMapper charsetMapper = null; /** @@ -269,7 +268,7 @@ /** * The ServletContext implementation associated with this Context. */ - protected transient ApplicationContext context = null; + protected ApplicationContext context = null; /** @@ -399,14 +398,14 @@ /** * The mapper associated with this context. */ - private transient org.apache.tomcat.util.http.mapper.Mapper mapper = + private org.apache.tomcat.util.http.mapper.Mapper mapper = new org.apache.tomcat.util.http.mapper.Mapper(); /** * The naming context listener for this web application. */ - private transient NamingContextListener namingContextListener = null; + private NamingContextListener namingContextListener = null; /** @@ -654,7 +653,7 @@ /** * Non proxied resources. */ - private transient DirContext webappResources = null; + private DirContext webappResources = null; private long startupTime; private long startTime; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org