ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject ignite git commit: Reverting debug changes.
Date Tue, 31 May 2016 06:21:54 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3202 1bb30a092 -> 63d543454


Reverting debug changes.


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

Branch: refs/heads/ignite-3202
Commit: 63d543454e6e97be699d2a2b97e2ac32a7dc2910
Parents: 1bb30a0
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue May 31 09:21:47 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue May 31 09:21:47 2016 +0300

----------------------------------------------------------------------
 .../hadoop/fs/BasicHadoopFileSystemFactory.java | 22 +++++++++-----------
 .../fs/CachingHadoopFileSystemFactory.java      |  1 -
 .../ignite/hadoop/util/BasicUserNameMapper.java |  2 --
 3 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/63d54345/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/BasicHadoopFileSystemFactory.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/BasicHadoopFileSystemFactory.java
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/BasicHadoopFileSystemFactory.java
index 6f30316..1a2d902 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/BasicHadoopFileSystemFactory.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/BasicHadoopFileSystemFactory.java
@@ -71,18 +71,16 @@ public class BasicHadoopFileSystemFactory implements HadoopFileSystemFactory,
Ex
 
     /** {@inheritDoc} */
     @Override public final FileSystem get(String name) throws IOException {
-//        String name0 = IgfsUtils.fixUserName(name);
-//
-//        if (usrNameMapper != null) {
-//            name0 = usrNameMapper.map(name0);
-//
-//            // If mapper returned null, we will use current user, so we "fix" user name
again.
-//            name0 = IgfsUtils.fixUserName(name0);
-//        }
-//
-//        return getWithMappedName(name0);
-
-        return getWithMappedName(IgfsUtils.fixUserName(name));
+        String name0 = IgfsUtils.fixUserName(name);
+
+        if (usrNameMapper != null) {
+            name0 = usrNameMapper.map(name0);
+
+            // If mapper returned null, we will use current user, so we "fix" user name again.
+            name0 = IgfsUtils.fixUserName(name0);
+        }
+
+        return getWithMappedName(name0);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/63d54345/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/CachingHadoopFileSystemFactory.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/CachingHadoopFileSystemFactory.java
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/CachingHadoopFileSystemFactory.java
index 95d96f6..bcbb082 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/CachingHadoopFileSystemFactory.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/CachingHadoopFileSystemFactory.java
@@ -23,7 +23,6 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.processors.hadoop.fs.HadoopFileSystemsUtils;
 import org.apache.ignite.internal.processors.hadoop.fs.HadoopLazyConcurrentMap;
-import org.apache.ignite.internal.processors.igfs.IgfsUtils;
 
 import java.io.IOException;
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/ignite/blob/63d54345/modules/hadoop/src/main/java/org/apache/ignite/hadoop/util/BasicUserNameMapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/util/BasicUserNameMapper.java
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/util/BasicUserNameMapper.java
index 1ed7701..aea7196 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/util/BasicUserNameMapper.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/util/BasicUserNameMapper.java
@@ -17,9 +17,7 @@
 
 package org.apache.ignite.hadoop.util;
 
-import org.apache.ignite.IgniteException;
 import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.lifecycle.LifecycleAware;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;


Mime
View raw message