Author: markt
Date: Sun Dec 30 22:58:33 2012
New Revision: 1427014
URL: http://svn.apache.org/viewvc?rev=1427014&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1427014&r1=1427013&r2=1427014&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sun Dec
30 22:58:33 2012
@@ -561,7 +561,6 @@ public class Http11NioProcessor extends
return;
}
NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
- attach.setCometOps(NioEndpoint.OP_CALLBACK);
RequestInfo rp = request.getRequestProcessor();
if (rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE) {
// Close event for this processor triggered by request
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1427014&r1=1427013&r2=1427014&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Dec 30
22:58:33 2012
@@ -1292,7 +1292,6 @@ public class NioEndpoint extends Abstrac
protected void reg(SelectionKey sk, KeyAttachment attachment, int
intops) {
sk.interestOps(intops);
attachment.interestOps(intops);
- attachment.setCometOps(intops);
}
protected void timeout(int keyCount, boolean hasEvents) {
@@ -1425,17 +1424,6 @@ public class NioEndpoint extends Abstrac
public boolean getComet() { return comet; }
public void setCometNotify(boolean notify) { this.cometNotify =
notify; }
public boolean getCometNotify() { return cometNotify; }
- /**
- * @deprecated Unused (value is set but never read) - will be removed
in
- * Tomcat 8
- */
- @Deprecated
- public void setCometOps(int ops) { this.cometOps = ops; }
- /**
- * @deprecated Unused - will be removed in Tomcat 8
- */
- @Deprecated
- public int getCometOps() { return cometOps; }
public NioChannel getChannel() { return getSocket();}
public void setChannel(NioChannel channel) { this.socket = channel;}
public int interestOps() { return interestOps;}
@@ -1465,17 +1453,6 @@ public class NioEndpoint extends Abstrac
public void awaitReadLatch(long timeout, TimeUnit unit) throws
InterruptedException { awaitLatch(readLatch,timeout,unit);}
public void awaitWriteLatch(long timeout, TimeUnit unit) throws
InterruptedException { awaitLatch(writeLatch,timeout,unit);}
- /**
- * @deprecated Unused - will be removed in Tomcat 8
- */
- @Deprecated
- public long getLastRegistered() { return lastRegistered; }
- /**
- * @deprecated Unused - will be removed in Tomcat 8
- */
- @Deprecated
- public void setLastRegistered(long reg) { lastRegistered = reg; }
-
public void setSendfileData(SendfileData sf) { this.sendfileData = sf;}
public SendfileData getSendfileData() { return this.sendfileData;}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
