[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch jetty-9 updated. jetty-8.1.5.v20120716-594-ge75e0e9

The branch, jetty-9 has been updated
       via  e75e0e9a04d733f1b0134d5b509aa052ba2cbd8f (commit)
       via  30ae8370bd9c9bbb1675a5703ec0b3193fb32c36 (commit)
       via  f34d74ec8433f8d784028085461102535c602eac (commit)
       via  9999db9c94499e18fbcf83bd14927f98e1aeab90 (commit)
      from  0c1ca16e864172bd7b06fa883b3fd999d4b2c662 (commit)


- Log -----------------------------------------------------------------
commit e75e0e9a04d733f1b0134d5b509aa052ba2cbd8f
Merge: 30ae837 0c1ca16
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Mon Jul 30 12:40:52 2012 -0700

    Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

commit 30ae8370bd9c9bbb1675a5703ec0b3193fb32c36
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Mon Jul 30 12:40:01 2012 -0700

    Fixing BlockheadClient and reading of frames

commit f34d74ec8433f8d784028085461102535c602eac
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Mon Jul 30 12:39:30 2012 -0700

    Some logging rework/repair

commit 9999db9c94499e18fbcf83bd14927f98e1aeab90
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Mon Jul 30 09:54:45 2012 -0700

    Fixing WebSocketAsyncConnection close/read logic to prevent unstoppable QTP threads

-----------------------------------------------------------------------

Summary of changes:
 .../org/eclipse/jetty/websocket/io/FrameBytes.java |    2 +-
 .../websocket/io/WebSocketAsyncConnection.java     |   56 ++++++++-------
 .../eclipse/jetty/websocket/protocol/Parser.java   |    8 ++-
 .../websocket/protocol/IncomingFramesCapture.java  |   17 +++++
 .../websocket/server/DeflateExtensionTest.java     |    6 +-
 .../websocket/server/FragmentExtensionTest.java    |    6 +-
 .../websocket/server/IdentityExtensionTest.java    |    6 +-
 .../websocket/server/WebSocketServletRFCTest.java  |   32 ++++----
 .../jetty/websocket/server/ab/AbstractABCase.java  |    2 +-
 .../jetty/websocket/server/ab/TestABCase1.java     |   24 ++++---
 .../jetty/websocket/server/ab/TestABCase5.java     |   38 +++++-----
 .../jetty/websocket/server/ab/TestABCase7_9.java   |   10 ++--
 .../server/blockhead/BlockheadClient.java          |   19 ++---
 ...arseCapture.java => IncomingFramesCapture.java} |   57 +++++++++++----
 .../websocket/server/helper/MessageSender.java     |   77 --------------------
 .../server/helper}/OutgoingFramesCapture.java      |    4 +-
 .../src/test/resources/jetty-logging.properties    |    8 ++-
 17 files changed, 178 insertions(+), 194 deletions(-)
 rename jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/{FrameParseCapture.java => IncomingFramesCapture.java} (59%)
 delete mode 100644 jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/MessageSender.java
 copy jetty-websocket/{websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol => websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper}/OutgoingFramesCapture.java (94%)


hooks/post-receive
-- 
Jetty: primary project repository