Author: markt Date: Tue Nov 4 22:00:50 2014 New Revision: 1636751 URL: http://svn.apache.org/r1636751 Log: s/cometNotify/callBackNotify/ since this is not Comet specific
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 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=1636751&r1=1636750&r2=1636751&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Nov 4 22:00:50 2014 @@ -605,7 +605,7 @@ public class NioEndpoint extends Abstrac if (attachment == null) { return false; } - attachment.setCometNotify(false); //will get reset upon next reg + attachment.setCallBackNotify(false); //will get reset upon next reg SocketProcessor sc = processorCache.pop(); if ( sc == null ) sc = new SocketProcessor(attachment, status); else sc.reset(attachment, status); @@ -789,16 +789,16 @@ public class NioEndpoint extends Abstrac if ( att!=null ) { //handle callback flag if ((interestOps & OP_CALLBACK) == OP_CALLBACK ) { - att.setCometNotify(true); + att.setCallBackNotify(true); } else { - att.setCometNotify(false); + att.setCallBackNotify(false); } interestOps = (interestOps & (~OP_CALLBACK));//remove the callback flag att.access();//to prevent timeout //we are registering the key to start with, reset the fairness counter. int ops = key.interestOps() | interestOps; att.interestOps(ops); - if (att.getCometNotify()) key.interestOps(0); + if (att.getCallBackNotify()) key.interestOps(0); else key.interestOps(ops); } else { cancel = true; @@ -1263,8 +1263,8 @@ public class NioEndpoint extends Abstrac cancelledKey(key); //we don't support any keys without attachments } else if ( ka.getError() ) { cancelledKey(key);//TODO this is not yet being used - } else if (ka.getCometNotify() ) { - ka.setCometNotify(false); + } else if (ka.getCallBackNotify() ) { + ka.setCallBackNotify(false); int ops = ka.interestOps() & ~OP_CALLBACK; reg(key,ka,0);//avoid multiple calls, this gets re-registered after invocation ka.interestOps(ops); @@ -1328,7 +1328,7 @@ public class NioEndpoint extends Abstrac public void reset(Poller poller, NioChannel channel, long soTimeout) { super.reset(channel, soTimeout); - cometNotify = false; + callBackNotify = false; interestOps = 0; this.poller = poller; sendfileData = null; @@ -1360,8 +1360,8 @@ public class NioEndpoint extends Abstrac public Poller getPoller() { return poller;} public void setPoller(Poller poller){this.poller = poller;} - public void setCometNotify(boolean notify) { this.cometNotify = notify; } - public boolean getCometNotify() { return cometNotify; } + public void setCallBackNotify(boolean notify) { this.callBackNotify = notify; } + public boolean getCallBackNotify() { return callBackNotify; } public int interestOps() { return interestOps;} public int interestOps(int ops) { this.interestOps = ops; return ops; } public CountDownLatch getReadLatch() { return readLatch; } @@ -1402,7 +1402,7 @@ public class NioEndpoint extends Abstrac private Poller poller = null; private int interestOps = 0; - private boolean cometNotify = false; + private boolean callBackNotify = false; private CountDownLatch readLatch = null; private CountDownLatch writeLatch = null; private SendfileData sendfileData = null; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org