From cf11c2394a18d3e00e56eef92bd99570d2f135d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Fenyvesi?= <tamas.fenyvesi@doknet.hu>
Date: Wed, 6 May 2020 11:27:45 +0200
Subject: [PATCH] fix session list relative links in TrainModule and
 ArbiterModule; fix auto-attach in ArbiterModule at arbiter/sid
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tamás Fenyvesi <tamas.fenyvesi@doknet.hu>
---
 .../arbiter/ui/module/ArbiterModule.java           | 14 ++++++++++----
 .../ui/module/train/TrainModule.java               |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java
index dab0174df..86be0f8d3 100644
--- a/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java
+++ b/arbiter/arbiter-ui/src/main/java/org/deeplearning4j/arbiter/ui/module/ArbiterModule.java
@@ -141,9 +141,15 @@ public class ArbiterModule implements UIModule {
                 (path, rc) -> rc.response().end(multiSession ? "true" : "false")));
         if (multiSession) {
             r.add(new Route("/arbiter", HttpMethod.GET, (path, rc) -> this.listSessions(rc)));
-            r.add(new Route("/arbiter/:sessionId", HttpMethod.GET, (path, rc) -> rc.response()
-                    .putHeader("content-type", "text/html; charset=utf-8")
-                    .sendFile("templates/ArbiterUI.html")));
+            r.add(new Route("/arbiter/:sessionId", HttpMethod.GET, (path, rc) -> {
+                if (knownSessionIDs.containsKey(path.get(0))) {
+                    rc.response()
+                            .putHeader("content-type", "text/html; charset=utf-8")
+                            .sendFile("templates/ArbiterUI.html");
+                } else {
+                    sessionNotFound(path.get(0), rc.request().path(), rc);
+                }
+            }));
 
             r.add(new Route("/arbiter/:sessionId/lastUpdate", HttpMethod.GET, (path, rc) -> {
                 if (knownSessionIDs.containsKey(path.get(0))) {
@@ -243,7 +249,7 @@ public class ArbiterModule implements UIModule {
         if (!knownSessionIDs.isEmpty()) {
             sb.append("        <ul>");
             for (String sessionId : knownSessionIDs.keySet()) {
-                sb.append("            <li><a href=\"arbiter/")
+                sb.append("            <li><a href=\"/arbiter/")
                         .append(sessionId).append("\">")
                         .append(sessionId).append("</a></li>\n");
             }
diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java
index e5c8d116e..8bde827f5 100644
--- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java
+++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/src/main/java/org/deeplearning4j/ui/module/train/TrainModule.java
@@ -246,7 +246,7 @@ public class TrainModule implements UIModule {
         if (!knownSessionIDs.isEmpty()) {
             sb.append("        <ul>");
             for (String sessionId : knownSessionIDs.keySet()) {
-                sb.append("            <li><a href=\"train/")
+                sb.append("            <li><a href=\"/train/")
                         .append(sessionId).append("\">")
                         .append(sessionId).append("</a></li>\n");
             }