ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [04/27] ignite git commit: IGNITE-3184: minor corrections.
Date Fri, 01 Jul 2016 12:10:47 GMT
IGNITE-3184: minor corrections.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa5f5a6d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa5f5a6d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa5f5a6d

Branch: refs/heads/ignite-3185
Commit: aa5f5a6d99d000eccd7d8840c901963a559bd7cf
Parents: f0d08f8
Author: iveselovskiy <iveselovskiy@gridgain.com>
Authored: Mon Jun 20 19:41:55 2016 +0300
Committer: iveselovskiy <iveselovskiy@gridgain.com>
Committed: Mon Jun 20 19:41:55 2016 +0300

----------------------------------------------------------------------
 bin/include/setenv.bat                                           | 2 +-
 .../main/java/org/apache/ignite/internal/util/IgniteUtils.java   | 3 +--
 .../ignite/internal/processors/hadoop/HadoopClassLoader.java     | 4 ++--
 .../ignite/internal/processors/hadoop/HadoopClasspathUtils.java  | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/aa5f5a6d/bin/include/setenv.bat
----------------------------------------------------------------------
diff --git a/bin/include/setenv.bat b/bin/include/setenv.bat
index 7022a36..dec1ee5 100644
--- a/bin/include/setenv.bat
+++ b/bin/include/setenv.bat
@@ -23,7 +23,7 @@
 :: in other scripts to set classpath using exported IGNITE_LIBS variable.
 ::
 
-:: @echo off
+@echo off
 
 :: USER_LIBS variable can optionally contain user's JARs/libs.
 :: set USER_LIBS=

http://git-wip-us.apache.org/repos/asf/ignite/blob/aa5f5a6d/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index c28e7bc..f802d94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -4049,8 +4049,7 @@ public abstract class IgniteUtils {
     public static void quietAndWarn(IgniteLogger log, Object msg, Object shortMsg) {
         warn(log, msg);
 
-        if (log != null
-            && log.isQuiet())
+        if (log != null && log.isQuiet())
             quiet(false, shortMsg);
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aa5f5a6d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
index 8b6ea34..62f9668 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
@@ -168,9 +168,9 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache
{
                 ldr = ldr.getParent();
             }
         }
-        catch (Throwable t) {
+        catch (Exception e) {
             U.quietAndWarn(null, "Failed to initialize Hadoop native library " +
-                "(native Hadoop methods might not work properly): " + t);
+                "(native Hadoop methods might not work properly): " + e);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aa5f5a6d/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java
index c4a2fcc..9f6d6b1 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClasspathUtils.java
@@ -137,7 +137,6 @@ public class HadoopClasspathUtils {
 
         c.add(new DirAndMask(new File(commonHome), "hadoop-common-"));
         c.add(new DirAndMask(new File(commonHome), "hadoop-auth-"));
-        c.add(new DirAndMask(new File(commonHome, "lib"), "hadoop-auth-"));
 
         c.add(new DirAndMask(new File(hdfsHome), "hadoop-hdfs-"));
 


Mime
View raw message