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: jruby/jruby
base: fe45447df641
Choose a base ref
...
head repository: jruby/jruby
compare: 330e5ee25917
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 14, 2016

  1. Catch LinkageError during DynamicScope generation. 

    When multiple threads are generating the same DynamicScope class, both
threads may try to generate the same class at the same time. When the second
thread hits defineClass, it throws a LinkageError becuase the class has already
been defined.

With this change we catch this exception and call loadClass to get the class that
the previous thread created.
    @snowp @headius
    snowp authored and headius committed Nov 14, 2016
    Copy the full SHA
    44e69de View commit details
    Browse the repository at this point in the history

  2. Synchronize DynamicScope generation to avoid LinkageError. 

    This is an enhancement to #4285 to avoid the exception altogether.

Any remaining exceptions that bubble out are intended to do so, so
we can see them and get reports and fix them. This modification
should effectively prevent double-loading (which caused the
LinkageError) but have reduced overhead.
    @headius
    headius committed Nov 14, 2016
    Copy the full SHA
    330e5ee View commit details
    Browse the repository at this point in the history