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: de714d0f31cc
Choose a base ref
...
head repository: jruby/jruby
compare: 11c23a9e3586
Choose a head ref
  • 3 commits
  • 8 files changed
  • 2 contributors

Commits on Jan 11, 2017

  1. [ji] for Scala name aliases check the original (Java) method name

    @kares
    kares committed Jan 11, 2017
    Configuration menu
    Copy the full SHA
    438a0a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2017

  1. [ji] deal with conflicting get/is Java method alias (for real) 

    currently we're nondeterministic and depend on reflected method order

foo -> getFoo method shall always win, since foo? is there for isFoo
in case both getFoo and isFoo are specified

the update should align nicely with expectations in #3470

due compatibility we can not fix #4432
isAnnotation() + getAnnotation(param) case is different since the get
method isn't a (real) getter (and we're avoding a clash due #3262)
    @kares
    kares committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    74c8725 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. Merge pull request #4435 from kares/test-ji-is3 

    [ji] deterministic Java bean-style method aliases
    @kares
    kares committed Jan 17, 2017
    Configuration menu
    Copy the full SHA
    11c23a9 View commit details
    Browse the repository at this point in the history