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</code>.
*/
- private transient Object applicationEventListenersObjects[] =
+ private Object applicationEventListenersObjects[] =
new Object[0];
/**
* The set of instantiated application lifecycle listener objects</code>.
*/
- 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: [email protected]
For additional commands, e-mail: [email protected]
