third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java - Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

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/RubyRepeatedField.java

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (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/src/main/java/com/google/protobuf/jruby/RubyMessage.java ('k') | third_party/protobuf/ruby/src/main/java/com/google/protobuf/jruby/Utils.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/RubyRepeatedField.java

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

index ae2907a98501c1499749de8fd632900103186f38..946f9e7468bbf0df3a50d860037e305f474c7838 100644

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

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

@@ -110,7 +110,7 @@ public class RubyRepeatedField extends RubyObject {

@JRubyMethod(name = "[]=")

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

int arrIndex = normalizeArrayIndex(index);

- value = Utils.checkType(context, fieldType, value, (RubyModule) typeClass);

+ Utils.checkType(context, fieldType, value, (RubyModule) typeClass);

IRubyObject defaultValue = defaultValue(context);

for (int i = this.storage.size(); i < arrIndex; i++) {

this.storage.set(i, defaultValue);

@@ -166,7 +166,7 @@ public class RubyRepeatedField extends RubyObject {

public IRubyObject push(ThreadContext context, IRubyObject value) {

if (!(fieldType == Descriptors.FieldDescriptor.Type.MESSAGE &&

value == context.runtime.getNil())) {

- value = Utils.checkType(context, fieldType, value, (RubyModule) typeClass);

+ Utils.checkType(context, fieldType, value, (RubyModule) typeClass);

}

this.storage.add(value);

return this.storage;