Merge branch 'devel' of codecrew.fi:bortal into devel

code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java

@@ -75,12 +75,16 @@ public class LayoutView {
 		{
 		{
 			selectedSet = new HashSet<>();
 			selectedSet = new HashSet<>();
 			selectedTop = menubean.findNavigation(getPagepath());
 			selectedTop = menubean.findNavigation(getPagepath());
-			while (selectedTop != null) {
+
+			while (selectedTop.getParent() != null) {
+				logger.info("Traversing to top {}, key {}", selectedTop, selectedTop.getKey());
 				selectedSet.add(selectedTop);
 				selectedSet.add(selectedTop);
 				selectedTop = selectedTop.getParent();
 				selectedTop = selectedTop.getParent();
 			}
 			}
+			selectedSet.add(selectedTop);
 
 
 			List<MenuNavigation> tops = menubean.getTopmenus();
 			List<MenuNavigation> tops = menubean.getTopmenus();
+
 			if (!tops.contains(selectedTop) && !tops.isEmpty()) {
 			if (!tops.contains(selectedTop) && !tops.isEmpty()) {
 				selectedTop = tops.get(0);
 				selectedTop = tops.get(0);
 			}
 			}