tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1237984 - in /tomcat/trunk/java/org/apache/catalina: Cluster.java ha/tcp/SimpleTcpCluster.java
Date Mon, 30 Jan 2012 20:40:37 GMT
Author: markt
Date: Mon Jan 30 20:40:37 2012
New Revision: 1237984

URL: http://svn.apache.org/viewvc?rev=1237984&view=rev
Log:
Remove deprecated code

Modified:
    tomcat/trunk/java/org/apache/catalina/Cluster.java
    tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java

Modified: tomcat/trunk/java/org/apache/catalina/Cluster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Cluster.java?rev=1237984&r1=1237983&r2=1237984&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Cluster.java Mon Jan 30 20:40:37 2012
@@ -66,23 +66,6 @@ public interface Cluster {
      */
     public Container getContainer();
 
-    /**
-     * Set the protocol parameters.
-     *
-     * @param protocol The protocol used by the cluster
-     * @deprecated
-     */
-    @Deprecated
-    public void setProtocol(String protocol);
-
-    /**
-     * Get the protocol used by the cluster.
-     *
-     * @return The protocol
-     * @deprecated
-     */
-    @Deprecated
-    public String getProtocol();
 
     // --------------------------------------------------------- Public Methods
 

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1237984&r1=1237983&r2=1237984&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon Jan 30 20:40:37
2012
@@ -904,26 +904,6 @@ public class SimpleTcpCluster extends Li
         return log;
     }
 
-
-    // ------------------------------------------------------------- deprecated
-
-    /**
-     *
-     * @see org.apache.catalina.Cluster#setProtocol(java.lang.String)
-     */
-    @Override
-    public void setProtocol(String protocol) {
-        // NO-OP
-    }
-
-    /**
-     * @see org.apache.catalina.Cluster#getProtocol()
-     */
-    @Override
-    public String getProtocol() {
-        return null;
-    }
-
     public int getChannelStartOptions() {
         return channelStartOptions;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message