Fixed some mis-merged files.

3 years ago · a2a0c3c118
parent f80137c46d
commit a2a0c3c118
2 changed files with 2 additions and 3 deletions
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
+++ b/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
@ -215,8 +215,8 @@ public class RubyDescriptor extends RubyObject {
    klass.include(new IRubyObject[] {messageExts});
    klass.instance_variable_set(runtime.newString(Utils.DESCRIPTOR_INSTANCE_VAR), this);
    klass.defineAnnotatedMethods(RubyMessage.class);
-        // Workaround for https://github.com/jruby/jruby/issues/7154
-        klass.searchMethod("respond_to?").setIsBuiltin(false);
+    // Workaround for https://github.com/jruby/jruby/issues/7154
+    klass.searchMethod("respond_to?").setIsBuiltin(false);
    return klass;
  }

--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
+++ b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
@ -860,7 +860,6 @@ public class RubyMessage extends RubyObject {
              this.builder.getDescriptorForType().findFieldByName(TYPE);
          if (typeBytesSymbol.equals(fields.get(enumFieldDescriptorForType))) {
            isDefaultStringForBytes = true;
-                    }
          }
        }
        builder.setField(