|
16 | 16 |
|
17 | 17 | package com.vaadin.flow.server; |
18 | 18 |
|
| 19 | +import java.io.BufferedWriter; |
| 20 | +import java.io.IOException; |
| 21 | +import java.io.InputStream; |
| 22 | +import java.io.OutputStream; |
| 23 | +import java.io.OutputStreamWriter; |
| 24 | +import java.io.PrintWriter; |
| 25 | +import java.io.Serializable; |
| 26 | +import java.lang.reflect.Constructor; |
| 27 | +import java.net.URL; |
| 28 | +import java.nio.charset.StandardCharsets; |
| 29 | +import java.security.MessageDigest; |
| 30 | +import java.util.ArrayList; |
| 31 | +import java.util.Collection; |
| 32 | +import java.util.Collections; |
| 33 | +import java.util.HashMap; |
| 34 | +import java.util.List; |
| 35 | +import java.util.Locale; |
| 36 | +import java.util.Map; |
| 37 | +import java.util.Map.Entry; |
| 38 | +import java.util.Optional; |
| 39 | +import java.util.ServiceLoader; |
| 40 | +import java.util.Set; |
| 41 | +import java.util.concurrent.CancellationException; |
| 42 | +import java.util.concurrent.ConcurrentHashMap; |
| 43 | +import java.util.concurrent.CopyOnWriteArrayList; |
| 44 | +import java.util.concurrent.Future; |
| 45 | +import java.util.concurrent.TimeUnit; |
| 46 | +import java.util.concurrent.locks.Lock; |
| 47 | +import java.util.concurrent.locks.ReentrantLock; |
| 48 | +import java.util.stream.Collectors; |
| 49 | +import java.util.stream.StreamSupport; |
| 50 | + |
| 51 | +import org.slf4j.Logger; |
| 52 | +import org.slf4j.LoggerFactory; |
| 53 | + |
19 | 54 | import com.vaadin.flow.component.UI; |
20 | 55 | import com.vaadin.flow.di.DefaultInstantiator; |
21 | 56 | import com.vaadin.flow.di.Instantiator; |
|
29 | 64 | import com.vaadin.flow.internal.UsageStatistics; |
30 | 65 | import com.vaadin.flow.router.RouteData; |
31 | 66 | import com.vaadin.flow.router.Router; |
| 67 | +import com.vaadin.flow.router.internal.AbstractNavigationStateRenderer; |
32 | 68 | import com.vaadin.flow.server.HandlerHelper.RequestType; |
33 | 69 | import com.vaadin.flow.server.communication.AtmospherePushConnection; |
34 | 70 | import com.vaadin.flow.server.communication.HeartbeatHandler; |
|
45 | 81 | import com.vaadin.flow.shared.JsonConstants; |
46 | 82 | import com.vaadin.flow.shared.Registration; |
47 | 83 | import com.vaadin.flow.shared.communication.PushMode; |
| 84 | + |
48 | 85 | import elemental.json.Json; |
49 | 86 | import elemental.json.JsonException; |
50 | 87 | import elemental.json.JsonObject; |
51 | 88 | import elemental.json.impl.JsonUtil; |
52 | | -import org.slf4j.Logger; |
53 | | -import org.slf4j.LoggerFactory; |
54 | | - |
55 | | -import java.io.BufferedWriter; |
56 | | -import java.io.IOException; |
57 | | -import java.io.InputStream; |
58 | | -import java.io.OutputStream; |
59 | | -import java.io.OutputStreamWriter; |
60 | | -import java.io.PrintWriter; |
61 | | -import java.io.Serializable; |
62 | | -import java.lang.reflect.Constructor; |
63 | | -import java.net.URL; |
64 | | -import java.nio.charset.StandardCharsets; |
65 | | -import java.security.MessageDigest; |
66 | | -import java.util.ArrayList; |
67 | | -import java.util.Collection; |
68 | | -import java.util.Collections; |
69 | | -import java.util.HashMap; |
70 | | -import java.util.List; |
71 | | -import java.util.Locale; |
72 | | -import java.util.Map; |
73 | | -import java.util.Map.Entry; |
74 | | -import java.util.Optional; |
75 | | -import java.util.ServiceLoader; |
76 | | -import java.util.Set; |
77 | | -import java.util.concurrent.CancellationException; |
78 | | -import java.util.concurrent.ConcurrentHashMap; |
79 | | -import java.util.concurrent.CopyOnWriteArrayList; |
80 | | -import java.util.concurrent.Future; |
81 | | -import java.util.concurrent.TimeUnit; |
82 | | -import java.util.concurrent.locks.Lock; |
83 | | -import java.util.concurrent.locks.ReentrantLock; |
84 | | -import java.util.stream.Collectors; |
85 | | -import java.util.stream.StreamSupport; |
86 | 89 |
|
87 | 90 | import static java.nio.charset.StandardCharsets.UTF_8; |
88 | 91 |
|
@@ -1345,9 +1348,12 @@ private void closeInactiveUIs(VaadinSession session) { |
1345 | 1348 | getLogger().debug("Closing inactive UI #{} in session {}", |
1346 | 1349 | ui.getUIId(), sessionId); |
1347 | 1350 | ui.close(); |
| 1351 | + AbstractNavigationStateRenderer |
| 1352 | + .purgeInactiveUIPreservedChainCache(ui); |
1348 | 1353 | }); |
1349 | 1354 | } |
1350 | 1355 | } |
| 1356 | + |
1351 | 1357 | } |
1352 | 1358 |
|
1353 | 1359 | /** |
|
0 commit comments