Merge branch '2.18'

FasterXML · Apr 28, 2024 · 0f05e63 · 0f05e63
2 parents 9bd74b8 + f5d29e9
commit 0f05e63
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/tools/jackson/core/Base64Variant.java b/src/main/java/tools/jackson/core/Base64Variant.java
@@ -44,7 +44,6 @@ public enum PaddingReadBehaviour {
          * padding characters are used.
          */
         PADDING_ALLOWED
-        ;
     }
 
     private final static int INT_SPACE = 0x20;
@@ -302,7 +301,6 @@ protected Object readResolve() {
                 || (_paddingChar != base._paddingChar)
                 || (_paddingReadBehaviour != base._paddingReadBehaviour)
                 || (_maxLineLength != base._maxLineLength)
-                || (_writePadding != base._writePadding)
                 ) {
             return new Base64Variant(base,
                     _name, _writePadding, _paddingChar, _paddingReadBehaviour, _maxLineLength);

diff --git a/src/main/java/tools/jackson/core/TreeNode.java b/src/main/java/tools/jackson/core/TreeNode.java
@@ -218,7 +218,7 @@ public interface TreeNode
     TreeNode path(int index);
 
     /**
-     * Method for accessing names of all properties for this node, iff
+     * Method for accessing names of all properties for this node, if (and only if)
      * this node is an Object node. Number of property names accessible
      * will be {@link #size}.
      *

diff --git a/src/main/java/tools/jackson/core/base/ParserBase.java b/src/main/java/tools/jackson/core/base/ParserBase.java
@@ -338,7 +338,7 @@ protected void _releaseBuffers() {
 
     /**
      * Method called when an EOF is encountered between tokens.
-     * If so, it may be a legitimate EOF, but only iff there
+     * If so, it may be a legitimate EOF, but <b>only</b> if there
      * is no open non-root context.
      */
     @Override