Author: markt Date: Sat Jul 7 18:39:48 2012 New Revision: 1358615 URL: http://svn.apache.org/viewvc?rev=1358615&view=rev Log: Further testing shows that this has no affect for BIO for a socket returned via accept()
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-receiver.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1358612 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1358615&r1=1358614&r2=1358615&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java Sat Jul 7 18:39:48 2012 @@ -143,7 +143,6 @@ public class BioReceiver extends Receive socket.setOOBInline(getOoBInline()); socket.setReuseAddress(getSoReuseAddress()); socket.setSoLinger(getSoLingerOn(),getSoLingerTime()); - socket.setTrafficClass(getSoTrafficClass()); socket.setSoTimeout(getTimeout()); ObjectReader reader = new ObjectReader(socket); task.serviceSocket(socket,reader); Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1358615&r1=1358614&r2=1358615&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jul 7 18:39:48 2012 @@ -73,8 +73,9 @@ <fix> Fix an issue when running under Java 7 which throws exceptions when trying to set an invalid option whereas Java 6 silently swallowed them. - The option using the problem was <code>soTrafficClass</code>. Note that - <code>soTrafficClass</code> is ignored for the NioReceiver. (markt) + The option using the problem was <code>soTrafficClass</code>. + Investigations showed that this option had no effect for Cluster Channel + Receivers it was removed. (markt) </fix> </changelog> </subsection> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-receiver.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-receiver.xml?rev=1358615&r1=1358614&r2=1358615&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-receiver.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-receiver.xml Sat Jul 7 18:39:48 2012 @@ -142,12 +142,6 @@ <attribute name="soReuseAddress" required="false"> Boolean value for the socket SO_REUSEADDR option. Possible values are <code>true</code> or <code>false</code>. </attribute> - <attribute name="soTrafficClass" required="false"> - Sets the traffic class level for the socket, the value is between 0 and 255. - Different values are defined in <a href="http://docs.oracle.com/javase/6/docs/api/java/net/Socket.html#setTrafficClass(int)"> - java.net.Socket#setTrafficClass(int)</a>. Note that this option is ignored - for the NioReceiver implementation. - </attribute> <attribute name="tcpNoDelay" required="false"> Boolean value for the socket TCP_NODELAY option. Possible values are <code>true</code> or <code>false</code>. The default value is <code>true</code> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org