You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/08 14:46:31 UTC
[49/50] ignite git commit: Minor adjustments.
Minor adjustments.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38bcc34a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38bcc34a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38bcc34a
Branch: refs/heads/ignite-3199-1
Commit: 38bcc34a42ccf3ab18cddb4039e7cfd80dd98c5b
Parents: bd11c1e
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 8 17:28:58 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 8 17:28:58 2016 +0300
----------------------------------------------------------------------
.../platform/websession/SessionStateData.java | 52 +++++++++++++++-----
.../websession/SetAndUnlockEntryProcessor.java | 2 +-
.../websession/UnlockEntryProcessor.java | 2 +-
3 files changed, 43 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38bcc34a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SessionStateData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SessionStateData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SessionStateData.java
index 59c161c..6eb3caa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SessionStateData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SessionStateData.java
@@ -55,6 +55,27 @@ public class SessionStateData implements Binarylizable {
private Timestamp lockTime;
/**
+ * @return Items.
+ */
+ public KeyValueDirtyTrackedCollection items() {
+ return items;
+ }
+
+ /**
+ * @return Static objects.
+ */
+ public byte[] staticObjects() {
+ return staticObjects;
+ }
+
+ /**
+ * @return Timeout.
+ */
+ public int timeout() {
+ return timeout;
+ }
+
+ /**
* @return Lock ID.
*/
public long lockId() {
@@ -100,23 +121,32 @@ public class SessionStateData implements Binarylizable {
}
/**
- * Update session state and release the lock.
+ * Unlock session state data.
*
- * @param update Updated data.
- * @return Result.
+ * @return Unlocked data.
*/
- public SessionStateData updateAndUnlock(@Nullable SessionStateData update) {
+ public SessionStateData unlock() {
assert isLocked();
- SessionStateData res = copyWithoutLockInfo();
+ return copyWithoutLockInfo();
+ }
+
+ /**
+ * Update session state and release the lock.
+ *
+ * @param items Items.
+ * @param staticObjects Static objects.
+ * @param timeout Timeout.
+ * @return Result.
+ */
+ public SessionStateData updateAndUnlock(KeyValueDirtyTrackedCollection items, byte[] staticObjects, int timeout) {
+ assert items != null;
- if (update != null) {
- assert items != null;
+ SessionStateData res = unlock();
- res.timeout = update.timeout;
- res.staticObjects = update.staticObjects;
- res.items.applyChanges(update.items);
- }
+ res.items.applyChanges(items);
+ res.staticObjects = staticObjects;
+ res.timeout = timeout;
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/38bcc34a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SetAndUnlockEntryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SetAndUnlockEntryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SetAndUnlockEntryProcessor.java
index 1efdb45..33e9d91 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SetAndUnlockEntryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/SetAndUnlockEntryProcessor.java
@@ -49,7 +49,7 @@ public class SetAndUnlockEntryProcessor implements CacheEntryProcessor<String, S
throw new IllegalStateException("Can not unlock session data: lock id check failed.");
// Unlock.
- data = data.updateAndUnlock(newData);
+ data = data.updateAndUnlock(newData.items(), newData.staticObjects(), newData.timeout());
// Apply.
entry.setValue(data);
http://git-wip-us.apache.org/repos/asf/ignite/blob/38bcc34a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/UnlockEntryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/UnlockEntryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/UnlockEntryProcessor.java
index a6d1ba1..a22c8a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/UnlockEntryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/websession/UnlockEntryProcessor.java
@@ -49,7 +49,7 @@ public class UnlockEntryProcessor implements CacheEntryProcessor<String, Session
throw new IllegalStateException("Can not unlock session data: lock id check failed.");
// Unlock.
- data = data.updateAndUnlock(null);
+ data = data.unlock();
entry.setValue(data);