[Git][java-team/mina2][master] 2 commits: Refresh SO_SNDBUF patch to attempt but not rethrow

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / mina2


Commits:
bc58296d by tony mancill at 2021-05-02T09:24:08-07:00
Refresh SO_SNDBUF patch to attempt but not rethrow

- - - - -
cef435f8 by tony mancill at 2021-05-02T09:33:06-07:00
interim changelog

- - - - -


2 changed files:

- debian/changelog
- debian/patches/SO_SNDBUF.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,8 @@
 mina2 (2.1.4-2) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Add patch to no longer set SO_SNDBUF (Closes: #986866)
+  * Add patch to ignore UnsupportedOperationException when setting SO_SNDBUF
+    in NioSocketAcceptor (Closes: #986866)
 
  -- tony mancill <tmancill at debian.org>  Sun, 02 May 2021 08:33:21 -0700
 


=====================================
debian/patches/SO_SNDBUF.patch
=====================================
@@ -1,4 +1,4 @@
-Description: no longer attempt to set SO_SNDBUF in NioSocketAcceptor
+Description: no longer throw when setting SO_SNDBUF fails in NioSocketAcceptor
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986866
 Author: tony mancill <tmancill at debian.org>
 Last-Update: 2021-05-02
@@ -6,17 +6,20 @@ Forwarded: no
 
 --- a/src/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
 +++ b/src/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
-@@ -251,9 +251,10 @@
+@@ -251,9 +251,13 @@
              socket.setReuseAddress(isReuseAddress());
              
              // Set the SND BUFF
 -	    if (config.getSendBufferSize() != -1) {
 -		channel.setOption(StandardSocketOptions.SO_SNDBUF, config.getSendBufferSize());
 -	    }
-+            // disabled - see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986866
-+	    //if (config.getSendBufferSize() != -1) {
-+		//channel.setOption(StandardSocketOptions.SO_SNDBUF, config.getSendBufferSize());
-+	    //}
++            try {
++	        if (config.getSendBufferSize() != -1) {
++		    channel.setOption(StandardSocketOptions.SO_SNDBUF, config.getSendBufferSize());
++	        }
++            } catch (UnsupportedOperationException uoe) {
++                // ignored - see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986866
++            }
  
  	    // Set the RCV BUFF
  	    if (config.getReceiveBufferSize() != -1) {



View it on GitLab: https://salsa.debian.org/java-team/mina2/-/compare/33dc8f1a5323dbb2198fdf0a454f1f8ef6cb8c6a...cef435f8f30dc8018eda7fdc11dd49c8e2045c07

-- 
View it on GitLab: https://salsa.debian.org/java-team/mina2/-/compare/33dc8f1a5323dbb2198fdf0a454f1f8ef6cb8c6a...cef435f8f30dc8018eda7fdc11dd49c8e2045c07
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210502/18574251/attachment.htm>