Remove deprecated method

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@980404 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/Manager.java b/java/org/apache/catalina/Manager.java
index 0a34013..8a7a897 100644 (file)
--- a/java/org/apache/catalina/Manager.java
+++ b/java/org/apache/catalina/Manager.java
@@ -270,21 +270,6 @@ public interface Manager {
     /**
      * Construct and return a new session object, based on the default
      * settings specified by this Manager's properties.  The session
-     * id will be assigned by this method, and available via the getId()
-     * method of the returned session.  If a new session cannot be created
-     * for any reason, return <code>null</code>.
-     * 
-     * @exception IllegalStateException if a new session cannot be
-     *  instantiated for any reason
-     * @deprecated
-     */
-    @Deprecated
-    public Session createSession();
-
-
-    /**
-     * Construct and return a new session object, based on the default
-     * settings specified by this Manager's properties.  The session
      * id specified will be used as the session id.
      * If a new session cannot be created for any reason, return 
      * <code>null</code>.

diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index 0e22616..25fea78 100644 (file)
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -766,23 +766,6 @@ public abstract class ManagerBase extends LifecycleMBeanBase
     /**
      * Construct and return a new session object, based on the default
      * settings specified by this Manager's properties.  The session
-     * id will be assigned by this method, and available via the getId()
-     * method of the returned session.  If a new session cannot be created
-     * for any reason, return <code>null</code>.
-     * 
-     * @exception IllegalStateException if a new session cannot be
-     *  instantiated for any reason
-     * @deprecated
-     */
-    @Deprecated
-    public Session createSession() {
-        return createSession(null);
-    }
-    
-    
-    /**
-     * Construct and return a new session object, based on the default
-     * settings specified by this Manager's properties.  The session
      * id specified will be used as the session id.  
      * If a new session cannot be created for any reason, return 
      * <code>null</code>.