merge pull master

JMRI · Oct 11, 2019 · f1fbdb7 · f1fbdb7
1 parent abccde2
commit f1fbdb7
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/java/src/jmri/jmrit/logix/configurexml/OBlockManagerXml.java b/java/src/jmri/jmrit/logix/configurexml/OBlockManagerXml.java
@@ -103,7 +103,7 @@ public Element store(Object o) {
                 // and put this element out
                 blocks.addContent(elem);
             }
-
+        }
         return blocks;
     }
 
@@ -429,17 +429,13 @@ private Portal loadPortal(Element elem) {
                     toBlock.addPortal(portal);
 
                     List<Element> ePathsToBlock = eToBlk.getChildren("path");
-                    for (int i = 0; i < ePathsToBlock.size(); i++) {
-                        Element e = ePathsToBlock.get(i);
-                        String pathName = e.getAttribute("pathName").getValue();
-                        String blockName = e.getAttribute("blockName").getValue();
-                        log.debug("Load portal= \"{}\" toBlock= {}, pathName= {}, blockName= {}",
-                                userName, toBlock.getSystemName(), pathName, blockName);
-                        /*if (toBlock.getSystemName().equals(blockName))*/ {
-                            // path is in the toBlock
-                            OPath path = getPath(toBlock, pathName);
-                            portal.addPath(path);
-                        }
+                    for (Element ePath : ePathsToBlock) {
+                        String pathName = ePath.getAttribute("pathName").getValue();
+                        String blockName = ePath.getAttribute("blockName").getValue();
+                        log.debug("Load portal= \"{}\" toBlock= {}, pathName= {}, blockName= {}", userName, toBlock.getSystemName(), pathName, blockName);
+                        // path is in the toBlock
+                        OPath path = getPath(toBlock, pathName);
+                        portal.addPath(path);
                     }
                 }
             }