You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2019/01/24 08:22:57 UTC
[ignite] branch ignite-835 updated (0c5f296 -> 5d12c26)
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a change to branch ignite-835
in repository https://gitbox.apache.org/repos/asf/ignite.git.
from 0c5f296 Merge remote-tracking branch 'remotes/origin/master' into ignite-835
new 763659e ignite-835
add a7386e5 IGNITE-10742 Replace java console to GridConsole. - Fixes #5890.
add 1a68016 IGNITE-10839 Web Console: Fixed sign in.
new 5d12c26 Merge remote-tracking branch 'remotes/origin/master' into ignite-835
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../internal/commandline/CommandHandler.java | 8 +-
.../ignite/internal/commandline/GridConsole.java | 54 +++++++++++++
.../internal/commandline/GridConsoleAdapter.java | 91 ++++++++++++++++++++++
.../NoopConsole.java} | 52 +++++++------
.../cache/GridCacheExplicitLockSpan.java | 12 ++-
modules/web-console/backend/app/mongo.js | 34 ++++----
modules/web-console/backend/services/auth.js | 8 +-
7 files changed, 212 insertions(+), 47 deletions(-)
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/commandline/GridConsole.java
create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/commandline/GridConsoleAdapter.java
copy modules/core/src/main/java/org/apache/ignite/internal/{stat/IoStatisticsHolderNoOp.java => commandline/NoopConsole.java} (51%)
[ignite] 01/02: ignite-835
Posted by sb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-835
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 763659ec948a349dde271c30186f6f3747740800
Author: sboikov <sb...@apache.org>
AuthorDate: Thu Jan 24 11:21:07 2019 +0300
ignite-835
---
.../internal/processors/cache/GridCacheExplicitLockSpan.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
index dfc12d7..f6badec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheExplicitLockSpan.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import java.util.Deque;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
@@ -163,7 +164,16 @@ public class GridCacheExplicitLockSpan extends ReentrantLock {
if (reentry != null) {
assert reentry.reentry() : reentry;
- boolean rmvd = deque.remove(reentry);
+ boolean rmvd = false;
+
+ Iterator<GridCacheMvccCandidate> it = deque.iterator();
+ while (it.hasNext()) {
+ if (it.next() == reentry) {
+ it.remove();
+ rmvd = true;
+ break;
+ }
+ }
assert rmvd : reentry;
[ignite] 02/02: Merge remote-tracking branch
'remotes/origin/master' into ignite-835
Posted by sb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-835
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 5d12c261f2a36ae09025b2a9c6a02c4c1abb58e3
Merge: 763659e 1a68016
Author: sboikov <sb...@apache.org>
AuthorDate: Thu Jan 24 11:21:21 2019 +0300
Merge remote-tracking branch 'remotes/origin/master' into ignite-835
.../internal/commandline/CommandHandler.java | 8 +-
.../ignite/internal/commandline/GridConsole.java | 54 +++++++++++++
.../internal/commandline/GridConsoleAdapter.java | 91 ++++++++++++++++++++++
.../ignite/internal/commandline/NoopConsole.java | 72 +++++++++++++++++
modules/web-console/backend/app/mongo.js | 34 ++++----
modules/web-console/backend/services/auth.js | 8 +-
6 files changed, 246 insertions(+), 21 deletions(-)