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: 7d954daeda10
Choose a base ref
...
head repository: jruby/jruby
compare: c885d6f193e4
Choose a head ref
  • 18 commits
  • 25 files changed
  • 2 contributors

Commits on Feb 27, 2015

  1. Copy the full SHA
    026d1d9 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ac6a9de View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    317e9ba View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    a3d28b8 View commit details
    Browse the repository at this point in the history
  5. test asserting that concurrent proxy initialization does dispatch met…

    …hods correctly
    
    closing #2014
    kares committed Feb 27, 2015
    Copy the full SHA
    0d1c338 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. Copy the full SHA
    2f5ff5c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    f857e70 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    61acccd View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    db7268b View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    679277d View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    342571a View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    0f3c822 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    875b25a View commit details
    Browse the repository at this point in the history
  9. minor (micro-bm) improvements in RubyToJavaInvoker's consturctor - le…

    …ss allocations
    
    - use IntHashMap (internally) to avoid integer "boxing"
    - instantiate varargs list on demand if it's needed
    kares committed Mar 2, 2015
    Copy the full SHA
    45f9045 View commit details
    Browse the repository at this point in the history
  10. Only consider breaks that originated from this proc's frame.

    The old logic here was turning all breaks that pass through an
    escaped proc into LongJumpError, even if they originated in a
    different frame/proc that could still validly handle the break.
    This commit modifies the logic to ignore the exception altogether
    (re-throwing it) if it is not associated with this proc/frame (by
    checking jumpTarget).
    
    Fixes #1270
    headius committed Mar 2, 2015
    Copy the full SHA
    e61b737 View commit details
    Browse the repository at this point in the history
  11. Merge remote-tracking branch 'origin/jruby-1_7'

    Conflicts:
    	core/src/main/java/org/jruby/RubyProc.java
    	core/src/main/java/org/jruby/javasupport/JavaMethod.java
    	core/src/main/java/org/jruby/javasupport/JavaSupport.java
    
    This commit puts JavaSupport back the way it was, so we can git mv
    instead and get merging across that move.
    headius committed Mar 2, 2015
    Copy the full SHA
    2366bd6 View commit details
    Browse the repository at this point in the history
  12. Copy the full SHA
    a8522d9 View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    c885d6f View commit details
    Browse the repository at this point in the history