Repository: openmeetings Updated Branches: refs/heads/4.0.x 4dfbb5058 -> 52454a600
[OPENMEETINGS-1801] fix is moved to wicket Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/52454a60 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/52454a60 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/52454a60 Branch: refs/heads/4.0.x Commit: 52454a6003a3dd315569fd8b5ad64e709d5a21e6 Parents: 4dfbb50 Author: Maxim Solodovnik <[email protected]> Authored: Wed Dec 27 11:28:44 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Dec 27 11:28:44 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/app/WebSession.java | 14 -------------- pom.xml | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/52454a60/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 ce0529e..9483562 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,7 +42,6 @@ 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; @@ -96,7 +95,6 @@ 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; @@ -138,18 +136,6 @@ 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/52454a60/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9e8ad33..ebe4bd0 100644 --- a/pom.xml +++ b/pom.xml @@ -58,9 +58,9 @@ <maven-war-plugin.version>3.2.0</maven-war-plugin.version> <!-- dependency versions --> <junit.version>4.12</junit.version> - <wicket.version>8.0.0-M8</wicket.version> - <wicketju.version>8.0.0-M8</wicketju.version> - <wickets.version>8.0.0-M8</wickets.version> + <wicket.version>8.0.0-SNAPSHOT</wicket.version> + <wicketju.version>8.0.0-SNAPSHOT</wicketju.version> + <wickets.version>8.0.0-SNAPSHOT</wickets.version> <red5-server.version>1.0.10-M4</red5-server.version> <red5-client.version>1.0.10-M4</red5-client.version> <spring.version>4.3.12.RELEASE</spring.version>
