[mina] 01/02: Merge branch 'bugfix/DIRMINA-1142' into 2.2.X

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

johnnyv pushed a commit to branch 2.2.X
in repository https://gitbox.apache.org/repos/asf/mina.git

commit fa58bb055a87e240bee81c7a1e7df27484c9e1b2
Merge: d90bbb9 024f23d
Author: Jonathan Valliere <jo...@apache.org>
AuthorDate: Sat Jul 31 02:54:04 2021 -0400

    Merge branch 'bugfix/DIRMINA-1142' into 2.2.X

 .../codec/AbstractProtocolDecoderOutput.java       |  66 +-
 .../codec/AbstractProtocolEncoderOutput.java       | 101 +--
 .../mina/filter/codec/ProtocolCodecFilter.java     | 918 +++++++++------------
 .../mina/filter/codec/ProtocolCodecSession.java    |  15 +-
 .../mina/filter/codec/ProtocolEncoderOutput.java   |  42 +-
 .../filter/codec/ParallelProtocolEncoderTest.java  | 184 +++++
 mina-core/src/test/resources/log4j.properties      |   4 +-
 .../apache/mina/http/HttpServerDecoderTest.java    | 472 ++++++-----
 8 files changed, 900 insertions(+), 902 deletions(-)

diff --cc mina-core/src/test/resources/log4j.properties
index d79de52,d79de52..b972832
--- a/mina-core/src/test/resources/log4j.properties
+++ b/mina-core/src/test/resources/log4j.properties
@@@ -16,11 -16,11 +16,11 @@@
  #############################################################################
  # Please don't modify the log level until we reach to acceptable test coverage.
  # It's very useful when I test examples manually.
--log4j.rootCategory=ERROR, stdout
++log4j.rootCategory=DEBUG, stdout
  
  log4j.appender.stdout=org.apache.log4j.ConsoleAppender
  log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
--log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
++log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] [%t] %p %c - %m%n
  
  # you could use this pattern to test the MDC with the Chat server
  #log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %t %p %X{name} [%X{user}] [%X{remoteIp}:%X{remotePort}] [%c] - %m%n