Javacode is removed from menubar.jsp.

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / ConnectionAction.java

diff --git a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
index d588d946d119b5fbe0b70b6f35615acb49b57ad0..7e655654aed6dcaa2205784e6f5e7ee146fc8736 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
+++ b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
@@ -113,13 +113,23 @@ public class ConnectionAction extends Action {
                                        .get("study.filter");
                        LoginContext context = (LoginContext) session.get("login.context");
 
-                       logger.info("Deconnection of " + getConnectedUser().toString()
+                       String connectedUsr = "";
+                       if (getConnectedUser() != null) {
+                               connectedUsr = getConnectedUser().toString();
+                       }
+                       
+                       logger.info("Deconnection of " + connectedUsr
                                        + ".");
-                       context.logout();
+                       
+                       if (context != null) {
+                               context.logout();
+                       }
 
                        // TODO: ProjectSettings.deleteDownloadDirectory(user);
-                       sfilter.put("state", "ANY");
-                       sfilter.put("author", "0");
+                       if (sfilter != null) {
+                               sfilter.put("state", "ANY");
+                               sfilter.put("author", "0");
+                       }
 
                        this.disconnect(); // Updates the session context