Fix client route removal (#930)

Cut/paste error in removeClientRoute() caused old sessions to be
kept around.

In order to help debug this, I also added some detailing to
session-details.jsp which turned out not to be needed. But it
might prove useful/interesting.

src/i18n/openfire_i18n_en.properties

@@ -1812,6 +1812,12 @@ session.details.back_button=Back to Summary
 session.details.node=Node
 session.details.local=Local
 session.details.remote=Remote
+session.details.sm-status=Stream Management
+session.details.sm-detached=Detached
+session.details.sm-resume=Enabled (with resume)
+session.details.sm-enabled=Enabled (no resume)
+session.details.sm-disabled=Disabled
+session.details.connection-type=Connection Type
 
 # Session row Page
 

src/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java

@@ -946,7 +946,7 @@ public class RoutingTableImpl extends BasicModule implements RoutingTable, Clust
                 lock.unlock();
             }
         }
-        localRoutingTable.removeRoute(new DomainPair("", route.getDomain()));
+        localRoutingTable.removeRoute(new DomainPair("", route.toString()));
         return clientRoute != null;
     }
 

src/web/session-details.jsp

@@ -29,6 +29,10 @@
                  java.util.Collection"
     errorPage="error.jsp"
 %>
+<%@ page import="org.jivesoftware.openfire.nio.NIOConnection" %>
+<%@ page import="org.jivesoftware.openfire.websocket.WebSocketConnection" %>
+<%@ page import="org.jivesoftware.openfire.http.HttpConnection" %>
+<%@ page import="org.jivesoftware.openfire.http.HttpSession" %>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -160,6 +164,52 @@
             <% } %>
         </td>
     </tr>
+    <%
+        if (currentSess instanceof LocalClientSession) {
+            LocalClientSession s = (LocalClientSession)currentSess;
+
+            %>
+    <tr>
+        <td class="c1">
+            <fmt:message key="session.details.sm-status"/>:
+        </td>
+        <td>
+            <%
+                if (s.isDetached()) {
+                    %><fmt:message key="session.details.sm-detached"/><%
+                } else if (s.getStreamManager().isEnabled()) {
+                    if (s.getStreamManager().getResume()) {
+                        %><fmt:message key="session.details.sm-resume"/><%
+                    } else {
+                        %><fmt:message key="session.details.sm-enabled"/><%
+                    }
+                } else {
+                    %><fmt:message key="session.details.sm-disabled"/><%
+                }
+            %>
+        </td>
+    </tr>
+    <tr>
+        <td class="c1">
+            <fmt:message key="session.details.connection-type"/>:
+        </td>
+        <td>
+            <%
+                if (s.isDetached()) {
+                    %><fmt:message key="session.details.sm-detached"/><%
+                } else if (s.getConnection() instanceof NIOConnection) {
+                    %>TCP<%
+                } else if (s.getConnection() instanceof WebSocketConnection) {
+                    %>WebSocket<%
+                } else if (s.getConnection() instanceof HttpSession.HttpVirtualConnection) {
+                    %>BOSH<%
+                } else {
+                    %>Unknown<%
+                }
+            %>
+        </td>
+    </tr>
+    <% } %>
     <tr>
         <td class="c1">
             <fmt:message key="session.details.status" />: