Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into exceptions2
Browse files Browse the repository at this point in the history
headius committed Feb 28, 2018

Verified

This commit was signed with the committer’s verified signature.
headius Charles Oliver Nutter
2 parents 96fc710 + 06570f1 commit 0e3d189
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions core/src/main/java/org/jruby/RubyModule.java
Original file line number Diff line number Diff line change
@@ -493,7 +493,7 @@ private void putMethod(String name, DynamicMethod method) {
* @param method
* @return method
*/ // NOTE: used by AnnotationBinder
public final DynamicMethod putMethod(final Ruby runtime, String name, DynamicMethod method) {
public DynamicMethod putMethod(final Ruby runtime, String name, DynamicMethod method) {
if (hasPrepends()) {
method = method.dup();
method.setImplementationClass(methodLocation);
@@ -1639,7 +1639,7 @@ public synchronized void defineAlias(String name, String oldName) {
* @param method
* @param oldName
*/ // NOTE: used by AnnotationBinder
public final void putAlias(String name, DynamicMethod method, String oldName) {
public void putAlias(String name, DynamicMethod method, String oldName) {
if (name.equals(oldName)) return;
putMethod(name, new AliasMethod(this, method, oldName));
}
@@ -1650,7 +1650,7 @@ public synchronized void defineAliases(List<String> aliases, String oldName) {
DynamicMethod method = searchForAliasMethod(getRuntime(), oldName);

for (String name: aliases) {
putAlias(name, new AliasMethod(this, method, oldName), oldName);
putAlias(name, method, oldName);
}

methodLocation.invalidateCoreClasses();

0 comments on commit 0e3d189

Please sign in to comment.