aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandy Zhang <sandyzhang@google.com>2024-03-25 20:50:39 -0400
committerSandy Zhang <sandyzhang@google.com>2024-03-25 20:50:39 -0400
commit2e51ff6de3e8c594d965b2ad8952b911383cf0bf (patch)
tree9b430d25cd2ae1ddf788ea0fc1f27b9122031ada
parent4886a9cd8ffe81caf4c4b5b9ef7ce0de426a7b08 (diff)
downloadprotobuf-2e51ff6de3e8c594d965b2ad8952b911383cf0bf.tar.gz
Cherry-pick required label handling in JRuby field descriptor from https://github.com/protocolbuffers/protobuf/commit/bca8fb6117cf24785edb238d96bffe2c3a6d7164
-rw-r--r--ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java b/ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
index 6f52e1006..189d881fb 100644
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
+++ b/ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
@@ -287,6 +287,8 @@ public class RubyFieldDescriptor extends RubyObject {
private void calculateLabel(ThreadContext context) {
if (descriptor.isRepeated()) {
this.label = context.runtime.newSymbol("repeated");
+ } else if (descriptor.isRequired()) {
+ this.label = context.runtime.newSymbol("required");
} else if (descriptor.isOptional()) {
this.label = context.runtime.newSymbol("optional");
} else {