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 2015/09/29 15:37:53 UTC
[1/3] ignite git commit: IGNITE-1567: Fixing typo.
Repository: ignite
Updated Branches:
refs/heads/ignite-1567 11b77dd2a -> 0c18ad80c
IGNITE-1567: Fixing typo.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42058e43
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42058e43
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42058e43
Branch: refs/heads/ignite-1567
Commit: 42058e438a077c37a05e6e28cbde2fb2ac202755
Parents: 11b77dd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 29 16:14:16 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 29 16:14:16 2015 +0300
----------------------------------------------------------------------
.../Impl/Portable/PortableSystemHandlers.cs | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/42058e43/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs
index 81d3ade..e994e28 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableSystemHandlers.cs
@@ -47,7 +47,7 @@ namespace Apache.Ignite.Core.Impl.Portable
internal static class PortableSystemHandlers
{
/** Write handlers. */
- private static volatile Dictionary<Type, PortableSystemWriteDelegate> _writeHandlers2 =
+ private static volatile Dictionary<Type, PortableSystemWriteDelegate> _writeHandlers =
new Dictionary<Type, PortableSystemWriteDelegate>();
/** Mutex for write handlers update. */
@@ -160,7 +160,7 @@ namespace Apache.Ignite.Core.Impl.Portable
{
PortableSystemWriteDelegate res;
- var writeHandlers0 = _writeHandlers2;
+ var writeHandlers0 = _writeHandlers;
// Have we ever met this type?
if (writeHandlers0 != null && writeHandlers0.TryGetValue(type, out res))
@@ -277,23 +277,23 @@ namespace Apache.Ignite.Core.Impl.Portable
{
lock (WriteHandlersMux)
{
- if (_writeHandlers2 == null)
+ if (_writeHandlers == null)
{
Dictionary<Type, PortableSystemWriteDelegate> writeHandlers0 =
new Dictionary<Type, PortableSystemWriteDelegate>();
writeHandlers0[type] = handler;
- _writeHandlers2 = writeHandlers0;
+ _writeHandlers = writeHandlers0;
}
- else if (!_writeHandlers2.ContainsKey(type))
+ else if (!_writeHandlers.ContainsKey(type))
{
Dictionary<Type, PortableSystemWriteDelegate> writeHandlers0 =
- new Dictionary<Type, PortableSystemWriteDelegate>(_writeHandlers2);
+ new Dictionary<Type, PortableSystemWriteDelegate>(_writeHandlers);
writeHandlers0[type] = handler;
- _writeHandlers2 = writeHandlers0;
+ _writeHandlers = writeHandlers0;
}
}
}
[2/3] ignite git commit: IGNITE-1282: Several fixes.
Posted by vo...@apache.org.
IGNITE-1282: Several fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c2965fe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c2965fe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c2965fe
Branch: refs/heads/ignite-1567
Commit: 4c2965feef190dd73acca52e16f62108206be43d
Parents: 1d6f45c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 29 16:36:57 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 29 16:36:57 2015 +0300
----------------------------------------------------------------------
.../platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 5 ++++-
.../Impl/Portable/PortableHandleDictionary.cs | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c2965fe/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs
index 8fd8825..d0ddefb 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs
@@ -293,7 +293,10 @@ namespace Apache.Ignite.Core.Impl
/// <returns>Value indicating whether specified dir looks like a Ignite home.</returns>
private static bool IsIgniteHome(DirectoryInfo dir)
{
- return dir.Exists && dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2;
+ return dir.Exists &&
+ dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2 &&
+ (dir.EnumerateDirectories().Count(x => x.Name == "modules") == 1 ||
+ dir.EnumerateDirectories().Count(x => x.Name == "platforms") == 1);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/4c2965fe/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs
index 32e1e02..98e92f1 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Portable/PortableHandleDictionary.cs
@@ -146,7 +146,8 @@ namespace Apache.Ignite.Core.Impl.Portable
/// <param name="that">Other dictionary.</param>
public void Merge(PortableHandleDictionary<TK, TV> that)
{
- Debug.Assert(that != null, "that == null");
+ if (that == null)
+ return;
AddIfAbsent(that._key1, that._val1);
AddIfAbsent(that._key2, that._val2);
[3/3] ignite git commit: Merge branch 'ignite-1282' into ignite-1567
Posted by vo...@apache.org.
Merge branch 'ignite-1282' into ignite-1567
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c18ad80
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c18ad80
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c18ad80
Branch: refs/heads/ignite-1567
Commit: 0c18ad80c357cf0c8253b48e1c8ed1e6147f23b0
Parents: 42058e4 4c2965f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 29 16:38:01 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 29 16:38:01 2015 +0300
----------------------------------------------------------------------
.../platforms/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 5 ++++-
.../Impl/Portable/PortableHandleDictionary.cs | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------