You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2008/03/11 11:21:40 UTC

svn commit: r635868 - /mina/trunk/core/src/main/java/org/apache/mina/transport/socket/AbstractSocketSessionConfig.java

Author: trustin
Date: Tue Mar 11 03:21:33 2008
New Revision: 635868

URL: http://svn.apache.org/viewvc?rev=635868&view=rev
Log:
Forgot to uncomment :(

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/transport/socket/AbstractSocketSessionConfig.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/AbstractSocketSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/AbstractSocketSessionConfig.java?rev=635868&r1=635867&r2=635868&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/AbstractSocketSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/AbstractSocketSessionConfig.java Tue Mar 11 03:21:33 2008
@@ -38,34 +38,34 @@
             return;
         }
         
-//        if (config instanceof AbstractSocketSessionConfig) {
-//            // Minimize unnecessary system calls by checking all 'propertyChanged' properties.
-//            AbstractSocketSessionConfig cfg = (AbstractSocketSessionConfig) config;
-//            if (cfg.isKeepAliveChanged()) {
-//                setKeepAlive(cfg.isKeepAlive());
-//            }
-//            if (cfg.isOobInlineChanged()) {
-//                setOobInline(cfg.isOobInline());
-//            }
-//            if (cfg.isReceiveBufferSizeChanged()) {
-//                setReceiveBufferSize(cfg.getReceiveBufferSize());
-//            }
-//            if (cfg.isReuseAddressChanged()) {
-//                setReuseAddress(cfg.isReuseAddress());
-//            }
-//            if (cfg.isSendBufferSizeChanged()) {
-//                setSendBufferSize(cfg.getSendBufferSize());
-//            }
-//            if (cfg.isSoLingerChanged()) {
-//                setSoLinger(cfg.getSoLinger());
-//            }
-//            if (cfg.isTcpNoDelayChanged()) {
-//                setTcpNoDelay(cfg.isTcpNoDelay());
-//            }
-//            if (cfg.isTrafficClassChanged() && getTrafficClass() != cfg.getTrafficClass()) {
-//                setTrafficClass(cfg.getTrafficClass());
-//            }
-//        } else {
+        if (config instanceof AbstractSocketSessionConfig) {
+            // Minimize unnecessary system calls by checking all 'propertyChanged' properties.
+            AbstractSocketSessionConfig cfg = (AbstractSocketSessionConfig) config;
+            if (cfg.isKeepAliveChanged()) {
+                setKeepAlive(cfg.isKeepAlive());
+            }
+            if (cfg.isOobInlineChanged()) {
+                setOobInline(cfg.isOobInline());
+            }
+            if (cfg.isReceiveBufferSizeChanged()) {
+                setReceiveBufferSize(cfg.getReceiveBufferSize());
+            }
+            if (cfg.isReuseAddressChanged()) {
+                setReuseAddress(cfg.isReuseAddress());
+            }
+            if (cfg.isSendBufferSizeChanged()) {
+                setSendBufferSize(cfg.getSendBufferSize());
+            }
+            if (cfg.isSoLingerChanged()) {
+                setSoLinger(cfg.getSoLinger());
+            }
+            if (cfg.isTcpNoDelayChanged()) {
+                setTcpNoDelay(cfg.isTcpNoDelay());
+            }
+            if (cfg.isTrafficClassChanged() && getTrafficClass() != cfg.getTrafficClass()) {
+                setTrafficClass(cfg.getTrafficClass());
+            }
+        } else {
             SocketSessionConfig cfg = (SocketSessionConfig) config;
             setKeepAlive(cfg.isKeepAlive());
             setOobInline(cfg.isOobInline());
@@ -77,7 +77,7 @@
             if (getTrafficClass() != cfg.getTrafficClass()) {
                 setTrafficClass(cfg.getTrafficClass());
             }
-//        }
+        }
     }
 
     /**