Changeset 8038 for branches/3.19-stable

Timestamp:

May 25, 2022, 10:44:28 AM (10 months ago)

Author:

Nicklas Nordborg

Message:

References #2278: Improvements to login page for better extensions

Sessions settings are now stored directly in the SessionControl which doesn't require that a user is logged in.

File:

• branches/3.19-stable/src/core/net/sf/basedb/core/SessionControl.java (modified) (9 diffs)

branches/3.19-stable/src/core/net/sf/basedb/core/SessionControl.java

@@ -143 +143 @@
   */
   private boolean closed;
+
+  /**
+    Stores name and value of session settings.
+    @since 3.19.3
+  */
+  private Map<String,Object> sessionSettings;
   
   /**
@@ -188 +194 @@
     this.currentClient = parent.currentClient;
     this.remoteId = parent.remoteId;
+    this.sessionSettings = parent.sessionSettings;
     this.dbControlCache = Collections.synchronizedMap(new WeakHashMap<DbControl,String>());
     this.currentContexts = parent.currentContexts;
@@ -219 +226 @@
     this.id = id;
     this.remoteId = remoteId;
+    this.sessionSettings = Collections.synchronizedMap(new HashMap<String,Object>());
     this.dbControlCache = Collections.synchronizedMap(new WeakHashMap<DbControl,String>());
     this.currentContexts = Collections.synchronizedMap(new HashMap<ContextKey, ItemContext>());
@@ -1237 +1245 @@
     li.userName = userData.getName();
     li.authenticationMethod = authenticationMethod;
-    li.sessionSettings = Collections.synchronizedMap(new HashMap<String,Object>());
     return li;
   }
@@ -1291 +1298 @@
     currentContexts.clear();
     allowedClients.clear();
+    sessionSettings.clear();
     loginInfo = null;
   }
@@ -2593 +2601 @@
   public <T> T getSessionSetting(String name)
   {
-    return loginInfo == null ? null : (T)loginInfo.sessionSettings.get(name);
+    return (T)sessionSettings.get(name);
   }
 
@@ -2607 +2615 @@
   public <T> T setSessionSetting(String name, Object value)
   {
-    if (loginInfo == null || loginInfo.sessionSettings == null) return null;
     if (value == null)
     {
-      return (T)loginInfo.sessionSettings.remove(name);
+      return (T)sessionSettings.remove(name);
     }
     else
     {
-      return (T)loginInfo.sessionSettings.put(name, value);
+      return (T)sessionSettings.put(name, value);
     }
   }
@@ -2938 +2945 @@
     private Map<String,SettingInfo> userDefaultSettings;
 
-    /**
-      Stores name and value of session settings.
-    */
-    private Map<String,Object> sessionSettings;
-
     private LoginInfo()
     {}
@@ -2961 +2963 @@
       this.userClientSettings = parent.userClientSettings;
       this.userDefaultSettings = parent.userDefaultSettings;
-      this.sessionSettings = parent.sessionSettings;
     }