ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/3] ignite git commit: IGNITE-1282: Several fixes.
Date Tue, 29 Sep 2015 13:37:54 GMT
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 <vozerov@gridgain.com>
Authored: Tue Sep 29 16:36:57 2015 +0300
Committer: vozerov-gridgain <vozerov@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);


Mime
View raw message