Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/mina into trunk
Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/19d71a52 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/19d71a52 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/19d71a52 Branch: refs/heads/trunk Commit: 19d71a52e11cae79d5d56c53c2390f200323a7cb Parents: 5147566 5f33726 Author: Emmanuel Lécharny <[email protected]> Authored: Sat May 11 23:54:44 2013 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Sat May 11 23:54:44 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/mina/coap/CoapMessage.java | 32 +++++++++++++- .../main/java/org/apache/mina/coap/CoapOption.java | 17 +++++++- .../java/org/apache/mina/coap/CoapOptionType.java | 3 + .../java/org/apache/mina/coap/MessageType.java | 3 + .../org/apache/mina/coap/codec/CoapDecoder.java | 4 +- .../org/apache/mina/coap/codec/CoapEncoder.java | 2 + .../org/apache/mina/coap/codec/TestMessages.java | 10 ++-- .../org/apache/mina/api/AbstractIoHandler.java | 9 ++++- .../main/java/org/apache/mina/api/IoHandler.java | 2 +- .../org/apache/mina/session/AbstractIoSession.java | 7 +-- .../mina/transport/nio/tcp/NioTcpClient.java | 13 +----- .../apache/mina/examples/coap/CoapGetServer.java | 6 +- 12 files changed, 78 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
