third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/ruby/pom.xml ('k') | third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java

diff --git a/third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java b/third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java

index 3adaa2a8bdc1cab90254fe8bc388015da334461c..2d4c03b567ea70b6a9f3681bf4df24ede01f6f51 100644

--- a/third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java

+++ b/third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java

@@ -148,8 +148,8 @@ public class RubyMap extends RubyObject {

@JRubyMethod(name = "[]=")

public IRubyObject indexSet(ThreadContext context, IRubyObject key, IRubyObject value) {

- key = Utils.checkType(context, keyType, key, (RubyModule) valueTypeClass);

- value = Utils.checkType(context, valueType, value, (RubyModule) valueTypeClass);

+ Utils.checkType(context, keyType, key, (RubyModule) valueTypeClass);

+ Utils.checkType(context, valueType, value, (RubyModule) valueTypeClass);

IRubyObject symbol;

if (valueType == Descriptors.FieldDescriptor.Type.ENUM &&

Utils.isRubyNum(value) &&