You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/09/13 00:23:20 UTC

[commons-collections] branch master updated: Escape ampersands in Javadoc.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b71693  Escape ampersands in Javadoc.
7b71693 is described below

commit 7b716934583ffb5d4111d1ffa2f4b1693506bd48
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Sep 12 20:23:16 2019 -0400

    Escape ampersands in Javadoc.
---
 .../apache/commons/collections4/trie/AbstractPatriciaTrie.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
index 37da91e..c19b077 100644
--- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -641,7 +641,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
      *       Otherwise, use it.
      *
      * 6) If the right child of the parent is the parent itself, we've
-     *    already found & returned the end of the Trie, so exit.
+     *    already found &amp; returned the end of the Trie, so exit.
      *
      * 7) Do Step 1 on the parent's right child.
      */
@@ -1184,8 +1184,8 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
      *        node != node.parent.left.
      *          - If node.parent.left is uplink from node.parent:
      *              - If node.parent.left is not root, return it.
-     *              - If it is root & root isEmpty, return null.
-     *              - If it is root & root !isEmpty, return root.
+     *              - If it is root &amp; root isEmpty, return null.
+     *              - If it is root &amp; root !isEmpty, return root.
      *          - If node.parent.left is not uplink from node.parent:
      *              - Follow right path for first right child from node.parent.left
      *
@@ -2364,7 +2364,7 @@ abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
             private TrieEntry<K, V> subtree; // the subtree to search within
 
             /**
-             * Starts iteration at the given entry & search only
+             * Starts iteration at the given entry &amp; search only
              * within the given subtree.
              */
             EntryIterator(final TrieEntry<K, V> startScan, final K prefix,