Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-11-08 18:06:01 +0000
committerGerrit Code Review @ Eclipse.org2013-12-04 16:14:56 +0000
commit8233349a064dc0ea7a1347b154114728b2d65806 (patch)
tree0f9449fdfcac994b1a43a568fc67cd0515341e8f /plugins/org.eclipse.osee.framework.manager.servlet
parentb0350ac9f7bcb8645573caf150c1b573c0c4f844 (diff)
downloadorg.eclipse.osee-8233349a064dc0ea7a1347b154114728b2d65806.tar.gz
org.eclipse.osee-8233349a064dc0ea7a1347b154114728b2d65806.tar.xz
org.eclipse.osee-8233349a064dc0ea7a1347b154114728b2d65806.zip
feature[ats_XJMFJ]: Remove update session code
Diffstat (limited to 'plugins/org.eclipse.osee.framework.manager.servlet')
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java23
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java2
2 files changed, 0 insertions, 25 deletions
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java
index 66d4ec97b94..9b314196f84 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java
@@ -19,9 +19,7 @@ import java.net.URLEncoder;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Comparator;
import java.util.Enumeration;
-import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.osee.framework.core.data.OseeServerContext;
@@ -34,7 +32,6 @@ import org.eclipse.osee.logger.Log;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Ordering;
/**
* @author Roberto E. Escobar
@@ -176,15 +173,6 @@ public class SessionClientLoopbackServlet extends UnsecuredOseeHttpServlet {
}
}
}
- if (sessionData == null) {
- List<? extends ISession> sortedByNewestCreationDate = sortByNewestCreationDate(filteredByAddress);
- for (ISession session : sortedByNewestCreationDate) {
- if (isSessionValid(session)) {
- sessionData = session;
- break;
- }
- }
- }
return sessionData != null ? sessionData.getClientPort() : -1;
}
@@ -197,15 +185,4 @@ public class SessionClientLoopbackServlet extends UnsecuredOseeHttpServlet {
}
});
}
-
- private List<? extends ISession> sortByNewestCreationDate(Iterable<? extends ISession> sessions) {
- Ordering<ISession> ordered = Ordering.from(new Comparator<ISession>() {
- @Override
- public int compare(ISession arg1, ISession arg2) {
- return Long.valueOf(arg1.getCreationDate().getTime()).compareTo(
- Long.valueOf(arg2.getCreationDate().getTime()));
- }
- });
- return ordered.reverse().sortedCopy(sessions);
- }
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java
index 643a5796b3d..272b1ef921d 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java
@@ -232,7 +232,6 @@ public class SystemManagerServlet extends UnsecuredOseeHttpServlet {
"User",
"Version",
"Machine",
- "Last Interaction",
"IP",
"Port",
"Delete"}));
@@ -250,7 +249,6 @@ public class SystemManagerServlet extends UnsecuredOseeHttpServlet {
session.getUserId(),
session.getClientVersion(),
session.getClientMachineName(),
- dateFormat.format(session.getLastInteractionDate()),
clientAddress,
clientPort,
getAnchor(AnchorType.DELETE_ANCHOR, sessionId, requestAddress, requestPort)}));

Back to the top