Remove a search-before-remove on ArrayList

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / impl / YangStatementParserListenerImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java
index 58aa60c1671e7a80ec4643db113dab28f10e2f70..95176b1955edb44211e0e7ab8995e2aac654bb65 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangStatementParserListenerImpl.java
@@ -40,7 +40,7 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList
     private QNameToStatementDefinition stmtDef;
     private PrefixToModule prefixes;
     private final List<String> toBeSkipped = new ArrayList<>();
-    private boolean isType = false;
+    private final boolean isType = false;
     private static final Logger LOG = LoggerFactory.getLogger(YangStatementParserListenerImpl.class);
 
     public YangStatementParserListenerImpl(final String sourceName) {
@@ -111,9 +111,9 @@ public class YangStatementParserListenerImpl extends YangStatementParserBaseList
                     && toBeSkipped.isEmpty()) {
                 writer.endStatement(ref);
             }
-            if (toBeSkipped.contains(statementName)) {
-                toBeSkipped.remove(statementName);
-            }
+
+            // No-op if the statement is not on the list
+            toBeSkipped.remove(statementName);
         } catch (SourceException e) {
             LOG.warn(e.getMessage(), e);
         }