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 2017/12/24 09:41:12 UTC
openmeetings git commit: [OPENMEETINGS-1801] pageId generation is
fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x cd8c9c8d7 -> a5592180b
[OPENMEETINGS-1801] pageId generation is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a5592180
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a5592180
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a5592180
Branch: refs/heads/4.0.x
Commit: a5592180b7f9d2c46515ce2c0776cef3cffd7f14
Parents: cd8c9c8
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Dec 24 16:41:04 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Dec 24 16:41:04 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/app/WebSession.java | 14 ++++++++++++++
.../org/apache/openmeetings/web/common/MainPanel.java | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a5592180/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 9483562..ce0529e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -42,6 +42,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.TimeZone;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.IWebSession;
@@ -95,6 +96,7 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS
public static final List<String> AVAILABLE_TIMEZONES = Arrays.asList(TimeZone.getAvailableIDs());
public static final Set<String> AVAILABLE_TIMEZONE_SET = new LinkedHashSet<>(AVAILABLE_TIMEZONES);
public static final String WICKET_ROOM_ID = "wicketroomid";
+ private final AtomicInteger pageId = new AtomicInteger(0);
private Long userId = null;
private Set<Right> rights = new HashSet<>();
private long languageId = -1;
@@ -136,6 +138,18 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS
}
@Override
+ public void invalidateNow() {
+ super.invalidateNow();
+ pageId.set(0);
+ }
+
+ @Override
+ public int nextPageId() {
+ super.nextPageId();
+ return pageId.getAndIncrement();
+ }
+
+ @Override
public Roles getRoles() {
if (rights.isEmpty()) {
isSignedIn();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a5592180/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 611bd6e..3fb2554 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -173,9 +173,9 @@ public class MainPanel extends Panel {
}
private void closeHandler(AbstractClientMessage msg) {
+ log.debug("WebSocketBehavior::closeHandler [uid: {}, session: {}, key: {}]", uid, msg.getSessionId(), msg.getKey());
//no chance to stop pingTimer here :(
if (uid != null) {
- log.debug("WebSocketBehavior::closeHandler [uid: {}, session: {}, key: {}]", uid, msg.getSessionId(), msg.getKey());
Application.get().exit(getClient());
uid = null;
}