You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/04/02 10:46:24 UTC
svn commit: r1670841 - in /openmeetings/branches/3.0.x/src:
axis/java/org/apache/openmeetings/axis/services/FileWebService.java
web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java
Author: solomax
Date: Thu Apr 2 08:46:23 2015
New Revision: 1670841
URL: http://svn.apache.org/r1670841
Log:
[OPENMEETINGS-1189] SID is not expiring while user stays in room
Modified:
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java
Modified: openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java?rev=1670841&r1=1670840&r2=1670841&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java (original)
+++ openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java Thu Apr 2 08:46:23 2015
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.axis.services;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.InputStream;
@@ -38,7 +40,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.documents.LoadLibraryPresentation;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
import org.apache.openmeetings.util.process.ConverterProcessResultList;
import org.apache.openmeetings.util.process.FileImportError;
@@ -56,9 +57,7 @@ import org.springframework.beans.factory
*
*/
public class FileWebService {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- FileWebService.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FileWebService.class, webAppRootKey);
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java?rev=1670841&r1=1670840&r2=1670841&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomPanel.java Thu Apr 2 08:46:23 2015
@@ -18,7 +18,9 @@
*/
package org.apache.openmeetings.web.user.rooms;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.RuntimeConfigurationType;
@@ -60,7 +62,7 @@ public class RoomPanel extends BasePanel
@Override
protected void onTimer(AjaxRequestTarget target) {
- WebSession.getString(1L); //dummy call to keep session alive
+ getBean(SessiondataDao.class).checkSession(WebSession.getSid()); //keep SID alive
}
});
}