Salome HOME
Context help is introduced.
[tools/siman.git] / Workspace / Siman / src / org / splat / simer / ConnectionAction.java
index f2706f45bc70916522dfae72e49264dc24201378..484e3548c86d11c6848c6741210be31c8a6a9bdb 100644 (file)
@@ -126,8 +126,9 @@ public class ConnectionAction extends Action {
                                initializationScreenContext(Constants.NONE);
 
                                res = _backmenu;
-                               if (res == null || "null".equals(res) || res.isEmpty()) {
-                                       res = Constants.NONE;
+                               if (res == null || "null".equals(res) || res.isEmpty()
+                                               || Constants.NONE.equals(res)) {
+                                       res = Constants.OPEN;
                                }
                        } catch (FailedLoginException error) {
                                setErrorCode("message.error.login." + error.getMessage());
@@ -178,8 +179,9 @@ public class ConnectionAction extends Action {
                        initializationScreenContext(Constants.NONE);
 
                        res = _backmenu;
-                       if (res == null || "null".equals(res)) {
-                               res = Constants.NONE;
+                       if (res == null || "null".equals(res) || res.isEmpty()
+                                       || Constants.NONE.equals(res)) {
+                               res = Constants.OPEN;
                        }
                } catch (Exception error) {
                        LOG.error("Reason:", error);