Author: remy.maucherat(a)jboss.com
Date: 2009-02-04 09:26:24 -0500 (Wed, 04 Feb 2009)
New Revision: 919
Modified:
trunk/java/org/apache/catalina/core/ContainerBase.java
trunk/java/org/apache/catalina/core/StandardContext.java
Log:
- Remove serializable.
Modified: trunk/java/org/apache/catalina/core/ContainerBase.java
===================================================================
--- trunk/java/org/apache/catalina/core/ContainerBase.java 2009-02-02 12:16:54 UTC (rev
918)
+++ trunk/java/org/apache/catalina/core/ContainerBase.java 2009-02-04 14:26:24 UTC (rev
919)
@@ -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;
@@ -57,7 +56,6 @@
import org.apache.naming.resources.ProxyDirContext;
import org.apache.tomcat.util.modeler.Registry;
import org.jboss.logging.Logger;
-import org.jboss.logging.Logger;
/**
@@ -121,7 +119,7 @@
*/
public abstract class ContainerBase
- implements Container, Lifecycle, Pipeline, MBeanRegistration, Serializable {
+ implements Container, Lifecycle, Pipeline, MBeanRegistration {
private static org.jboss.logging.Logger log=
org.jboss.logging.Logger.getLogger( ContainerBase.class );
@@ -1406,7 +1404,7 @@
protected String suffix;
protected ObjectName oname;
protected ObjectName controller;
- protected transient MBeanServer mserver;
+ protected MBeanServer mserver;
public ObjectName getJmxName() {
return oname;
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2009-02-02 12:16:54 UTC (rev
918)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-02-04 14:26:24 UTC (rev
919)
@@ -121,9 +121,9 @@
public class StandardContext
extends ContainerBase
- implements Context, Serializable, NotificationEmitter
+ implements Context, NotificationEmitter
{
- private static transient Logger log = Logger.getLogger(StandardContext.class);
+ private static Logger log = Logger.getLogger(StandardContext.class);
// ----------------------------------------------------------- Constructors
@@ -220,14 +220,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];
@@ -246,12 +246,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;
/**
@@ -282,7 +282,7 @@
/**
* The ServletContext implementation associated with this Context.
*/
- protected transient ApplicationContext context = null;
+ protected ApplicationContext context = null;
/**
@@ -425,14 +425,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;
/**
@@ -680,7 +680,7 @@
/**
* Non proxied resources.
*/
- private transient DirContext webappResources = null;
+ private DirContext webappResources = null;
private long startupTime;
private long startTime;