Merge remote-tracking branch 'upstream/main' into fix_jruby_proto3_optional

# Conflicts:
#	ruby/tests/stress.rb

ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java

diff --git a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
index ec57a4b..b30d0b1 100644
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
+++ b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
@@ -203,7 +203,7 @@
     sb.append(cname).append(colon);
 
     for (FieldDescriptor fd : descriptor.getFields()) {
-      if (fd.hasPresence() && !fields.containsKey(fd)) {
+      if (fd.hasPresence() && !(fields.containsKey(fd) || builder.hasField(fd))) {
         continue;
       }
       if (addComma) {
@@ -551,8 +551,7 @@
       } else if (fields.containsKey(fieldDescriptor)) {
         dup.setFieldInternal(context, fieldDescriptor, fields.get(fieldDescriptor));
       } else if (this.builder.hasField(fieldDescriptor)) {
-        dup.fields.put(
-            fieldDescriptor,
+        dup.setFieldInternal(context, fieldDescriptor,
             wrapField(context, fieldDescriptor, this.builder.getField(fieldDescriptor)));
       }
     }

ruby/tests/stress.rb

diff --git a/ruby/tests/stress.rb b/ruby/tests/stress.rb
index 4ad37c1..c564320 100755
--- a/ruby/tests/stress.rb
+++ b/ruby/tests/stress.rb
@@ -19,9 +19,11 @@
       data = TestMessage.encode(m)
       100_000.times do
         mnew = TestMessage.decode(data)
-        mnew = mnew.dup
+        mnew2 = mnew.dup
         assert_equal m.inspect, mnew.inspect
         assert_equal data, TestMessage.encode(mnew)
+        assert_equal m.inspect, mnew2.inspect
+        assert_equal data, TestMessage.encode(mnew2)
       end
     end
   end