MID-3957 fixed session expiration

Evolveum · Nov 15, 2017 · d880024 · d880024
1 parent 4ffeee9
commit d880024
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
@@ -63,7 +63,7 @@ public class ProgressReporter implements ProgressListener {
 
     private MidPointApplication application;
     private Map<String, String> nameCache = new HashMap<>();
-    private ProgressDto progress;
+    private ProgressDto progress = new ProgressDto();
     private boolean abortRequested;
 
     private Future future;
@@ -83,8 +83,6 @@ public class ProgressReporter implements ProgressListener {
     public ProgressReporter(String id, MidPointApplication application) {
         this.id = id;
         this.application = application;
-
-        progress = new ProgressDto();
     }
 
     public String getId() {

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporterManager.java b/...i/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporterManager.java
@@ -77,7 +77,10 @@ public void onCreated(Session session) {
 
     @Override
     public void onUnbound(String sessionId) {
-        for (Key key : reporters.keySet()) {
+        Set<Key> keys = new HashSet();
+        keys.addAll(reporters.keySet());
+
+        for (Key key : keys) {
             if (!key.sessionId.equals(sessionId)) {
                 continue;
             }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -267,6 +267,8 @@ public void updateAjaxAttributes(AbstractDefaultAjaxBehavior behavior, AjaxReque
             }
         });
 
+        getSessionListeners().add(progressReporterManager);
+
         //descriptor loader, used for customization
         new DescriptorLoader().loadData(this);
     }

diff --git a/gui/admin-gui/src/main/resources/application.yml b/gui/admin-gui/src/main/resources/application.yml
@@ -5,8 +5,7 @@ spring:
 server:
   display-name: MidPoint
   session:
-    cookie:
-      max-age: 900
+    timeout: 900
   tomcat:
     basedir: ${midpoint.home}