[jboss-xnio] 01/09: Merge tag 'upstream/3.4.0'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository jboss-xnio.

commit 77d10a10e291077e40c60031f113aaf12884671d
Merge: 64fbcf2 a109a27
Author: Markus Koschany <apo at debian.org>
Date:   Thu Aug 4 20:18:08 2016 +0200

    Merge tag 'upstream/3.4.0'
    
    Upstream version 3.4.0
    
    # gpg: Signature made Thu 04 Aug 2016 20:17:58 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 api/pom.xml                                        |   12 +-
 api/src/main/java/org/xnio/AbstractIoFuture.java   |  699 +++++++--
 api/src/main/java/org/xnio/AutomaticReference.java |    4 +
 api/src/main/java/org/xnio/Buffers.java            |   80 +
 api/src/main/java/org/xnio/ByteBufferPool.java     |  416 +++++
 .../main/java/org/xnio/ByteBufferSlicePool.java    |    1 +
 api/src/main/java/org/xnio/IoUtils.java            |   48 +-
 api/src/main/java/org/xnio/Option.java             |   10 +-
 api/src/main/java/org/xnio/Options.java            |   24 +-
 api/src/main/java/org/xnio/Pool.java               |   22 +
 api/src/main/java/org/xnio/Pooled.java             |    2 +
 api/src/main/java/org/xnio/Version.java            |    3 +-
 api/src/main/java/org/xnio/XnioWorker.java         |   13 +-
 .../channels/TranslatingSuspendableChannel.java    |    1 -
 .../org/xnio/ssl/AbstractAcceptingSslChannel.java  |    2 +-
 .../xnio/ssl/JsseAcceptingSslStreamConnection.java |   15 +-
 .../java/org/xnio/ssl/JsseSslConduitEngine.java    | 1190 ---------------
 .../main/java/org/xnio/ssl/JsseSslConnection.java  |  145 ++
 .../java/org/xnio/ssl/JsseSslStreamConnection.java |  195 ---
 .../org/xnio/ssl/JsseSslStreamSinkConduit.java     |  224 ---
 .../org/xnio/ssl/JsseSslStreamSourceConduit.java   |  175 ---
 .../main/java/org/xnio/ssl/JsseStreamConduit.java  | 1614 ++++++++++++++++++++
 api/src/main/java/org/xnio/ssl/JsseXnioSsl.java    |   61 +-
 api/src/test/java/org/xnio/IoUtilsTestCase.java    |   30 +-
 .../channels/EmptyStreamSourceChannelTestCase.java |   11 +-
 api/src/test/java/org/xnio/mock/ConduitMock.java   |   73 +-
 .../test/java/org/xnio/mock/XnioIoThreadMock.java  |   68 +-
 .../test/java/org/xnio/mock/XnioWorkerMock.java    |    5 +-
 .../CloseReadingSslChannelTestCase.java            |    6 +-
 .../ssl/AbstractConnectedSslStreamChannelTest.java |   25 +-
 .../org/xnio/ssl/AbstractSslConnectionTest.java    |   30 +-
 ...ctedSslStreamChannelBufferOverflowTestCase.java |    8 +-
 .../ssl/ConnectedSslStreamChannelReadTestCase.java |   13 +-
 ...ConnectedSslStreamChannelReadWriteTestCase.java |  110 +-
 .../ConnectedSslStreamChannelWriteTestCase.java    |   19 +-
 ...eSslStreamConnectionBufferOverflowTestCase.java |   23 +-
 .../xnio/ssl/JsseSslStreamConnectionTestCase.java  |  104 +-
 .../xnio/ssl/JsseSslStreamSinkConduitTestCase.java |  437 ------
 .../ssl/JsseSslStreamSourceConduitTestCase.java    |   18 +-
 .../java/org/xnio/ssl/JsseXnioSslTestCase.java     |   47 +-
 .../ssl/SslStreamConnectionValidationTestCase.java |  163 +-
 .../java/org/xnio/ssl/StartTLSChannelTestCase.java |   53 +-
 .../org/xnio/ssl/StartTLSConnectionTestCase.java   |   38 +-
 .../test/java/org/xnio/ssl/mock/SSLEngineMock.java |  109 +-
 .../streams/BufferPipeInputStreamTestCase.java     |    2 +-
 .../test/java/org/xnio/streams/PipeTestCase.java   |   25 +-
 api/src/test/resources/logging.properties          |   41 +
 .../CloseReadingSslChannelTestCase.btm             |   26 +-
 hipchatlog.txt                                     |    2 +
 nio-impl/pom.xml                                   |    8 +-
 .../main/java/org/xnio/nio/NioSocketConduit.java   |   13 +-
 nio-impl/src/main/java/org/xnio/nio/NioXnio.java   |   16 +-
 nio-impl/src/main/java/org/xnio/nio/Version.java   |    3 +-
 .../src/main/java/org/xnio/nio/WorkerThread.java   |    6 +
 .../xnio/nio/test/AbstractNioChannelPipeTest.java  |  124 --
 .../org/xnio/nio/test/AbstractNioSslTcpTest.java   |  414 +++++
 .../java/org/xnio/nio/test/AbstractNioTcpTest.java |  165 +-
 .../nio/test/ConnectionOptionSetupTestCase.java    |   60 +-
 .../nio/test/NioFullDuplexChannelPipeTestCase.java |  142 --
 .../xnio/nio/test/NioSslTcpChannelTestCase.java    |  477 +-----
 .../xnio/nio/test/NioSslTcpConnectionTestCase.java |  504 +-----
 .../nio/test/NioStartTLSTcpChannelTestCase.java    |  276 ++--
 .../nio/test/NioStartTLSTcpConnectionTestCase.java |  317 ++--
 .../org/xnio/nio/test/NioTcpChannelTestCase.java   |   16 +-
 .../xnio/nio/test/NioTcpConnectionTestCase.java    |   16 +-
 .../java/org/xnio/nio/test/TcpChannelTestCase.java |   10 +-
 .../org/xnio/nio/test/TcpConnectionTestCase.java   |   10 +-
 pom.xml                                            |   19 +-
 68 files changed, 4273 insertions(+), 4765 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-xnio.git