AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fixed some mis-merged files.

Browse Source
This commit is contained in:
Joshua Haberman 2022-04-22 17:18:36 +00:00
parent f80137c46d
commit a2a0c3c118
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
View File

@ -215,8 +215,8 @@ public class RubyDescriptor extends RubyObject {
klass.include(new IRubyObject[] {messageExts}); klass.include(new IRubyObject[] {messageExts});
klass.instance_variable_set(runtime.newString(Utils.DESCRIPTOR_INSTANCE_VAR), this); klass.instance_variable_set(runtime.newString(Utils.DESCRIPTOR_INSTANCE_VAR), this);
klass.defineAnnotatedMethods(RubyMessage.class); klass.defineAnnotatedMethods(RubyMessage.class);
// Workaround for https://github.com/jruby/jruby/issues/7154 // Workaround for https://github.com/jruby/jruby/issues/7154
klass.searchMethod("respond_to?").setIsBuiltin(false); klass.searchMethod("respond_to?").setIsBuiltin(false);
return klass; return klass;
} }

1
ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
View File

@ -860,7 +860,6 @@ public class RubyMessage extends RubyObject {
this.builder.getDescriptorForType().findFieldByName(TYPE); this.builder.getDescriptorForType().findFieldByName(TYPE);
if (typeBytesSymbol.equals(fields.get(enumFieldDescriptorForType))) { if (typeBytesSymbol.equals(fields.get(enumFieldDescriptorForType))) {
isDefaultStringForBytes = true; isDefaultStringForBytes = true;
}
} }
} }
builder.setField( builder.setField(