Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TooTallNate/Java-WebSocket
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: bluechips23/Java-WebSocket
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 9 files changed
  • 5 contributors

Commits on Dec 17, 2015

  1. * Fixing a state bug that results in NPE's and thread death. The conn… 

    …ection needs to be set to null on each iteration to avoid the wrong connection being closed when a new connection fails.
    @etaham
    etaham committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    a7fb7f5 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2016

  1. Don't shutdown the ssl executor service too early 

    The ExecutorService held by the DefaultSSLWebSocketServerFactory was being
shutdown when the first SSLSocketChannel2 got closed, making it unusable
for further connections. It's now being closed on server stop instead.
    @bendem @etaham
    bendem authored and etaham committed Jan 6, 2016
    Configuration menu
    Copy the full SHA
    76a1a3f View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2016

  1. Fix for NPE on WSS Portscan. Fixes #388 & #349

    @becast
    becast committed Jun 25, 2016
    Configuration menu
    Copy the full SHA
    f90c663 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2017

  1. line endings

    @becast
    becast committed Jan 4, 2017
    Configuration menu
    Copy the full SHA
    6c673a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. Merge pull request #1 from blackrock/master 

    * Fixing a state bug that results in NPE's and thread death.
    @bluechips23
    bluechips23 authored Jan 5, 2017
    Configuration menu
    Copy the full SHA
    f1300ec View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from becast/master 

    Fix for NPE on WSS portscan
    @bluechips23
    bluechips23 authored Jan 5, 2017
    Configuration menu
    Copy the full SHA
    5591bff View commit details
    Browse the repository at this point in the history

  3. Merged fixes from PR #389 for NPE during port scanning

    @bluechips23
    bluechips23 committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    98a8d62 View commit details
    Browse the repository at this point in the history

  4. Updated cucumber and junit dependencies to newer versions

    @bluechips23
    bluechips23 committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    c90a02d View commit details
    Browse the repository at this point in the history

  5. Updated the ignore file.

    @bluechips23
    bluechips23 committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    e26cbeb View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. Removed dist and gradle folders

    @bluechips23
    bluechips23 committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    651e57e View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2017

  1. Merge pull request #3 from blackrock/pool-shutdown-bug 

    Don't shutdown the ssl executor service too early
    @bluechips23
    bluechips23 authored Jan 11, 2017
    Configuration menu
    Copy the full SHA
    0ae51f9 View commit details
    Browse the repository at this point in the history
Loading