aboutsummaryrefslogtreecommitdiffhomepage
path: root/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
diff options
context:
space:
mode:
authorGravatar Chris Fallin <cfallin@c1f.net>2015-05-15 10:52:56 -0700
committerGravatar Chris Fallin <cfallin@c1f.net>2015-05-15 10:52:56 -0700
commita526605aec4358e948bde0a8ad63f5f1de6f2cb5 (patch)
treecc64517d7e1d38f72779f963294b36f78431d7a4 /ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
parent09e584b57aaa8e3e5c45162a8bdbc1d1864a8f5a (diff)
parentd1b52a00e002fd7a4adbcdeafa0634de6088a88f (diff)
Merge pull request #338 from skippy/encode-decode-helpers
ruby: Encode decode cleanup and behavior normalization
Diffstat (limited to 'ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java')
-rw-r--r--ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java b/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
index b25dc6e1..2d4c03b5 100644
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
+++ b/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
@@ -338,7 +338,7 @@ public class RubyMap extends RubyObject {
return newMap;
}
- @JRubyMethod(name = "to_h")
+ @JRubyMethod(name = {"to_h", "to_hash"})
public RubyHash toHash(ThreadContext context) {
return RubyHash.newHash(context.runtime, table, context.runtime.getNil());
}