Project

General

Profile

« Previous | Next » 

Revision b14494a9

Added by Andreas Kohlbecker over 5 years ago

fix #7036 making sure all spring beans are disposed when the vaadin session times out

  • RegistrationToolbar, RegistrationUI, RegistrationWorkingsetPresenter, NavigationManagerBean as DisposableBean
  • seetting the vaadin closeIdleSessions parameter to true in web.xml

View differences:

src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java
33 33
import eu.etaxonomy.vaadin.ui.view.PopupView;
34 34

  
35 35
@UIScope
36
public class NavigationManagerBean extends SpringNavigator implements NavigationManager {
36
public class NavigationManagerBean extends SpringNavigator implements NavigationManager, DisposableBean {
37 37

  
38 38
	private static final long serialVersionUID = 6599898650948333853L;
39 39

  
......
261 261
        return null;
262 262
    }
263 263

  
264

  
265 264
    /**
266 265
     * @return the defaultViewName
267 266
     */
......
269 268
        return defaultViewName;
270 269
    }
271 270

  
272

  
273 271
    /**
274 272
     * @param defaultViewName the defaultViewName to set
275 273
     */
......
282 280
    }
283 281

  
284 282
    /**
285
     * {@inheritDoc}
283
     * implementation of the interface {@link DisposableBean} and overrides the
284
     * method in {@link Navigator} which is not an implementation of {@link DisposableBean}
285
     * in this class.
286 286
     */
287 287
    @Override
288 288
    public void destroy() {
289 289
        super.destroy();
290 290
        uiEventBus.unsubscribe(this);
291
        popupViewRegistration = null;
292
        // release the reference to the view kept in currentView
293
        // which could be expensive
294
        // by navigating to the default view
295
        navigateTo(defaultViewName);
291 296
    }
292

  
293

  
294 297
}

Also available in: Unified diff