Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ignite.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sboikov@apache.org
To: commits@ignite.incubator.apache.org
Date: Thu, 28 May 2015 16:30:07 -0000
Message-Id: <da204608fae54e8aab3056bdcc6c26d6@git.apache.org>
Subject: [1/4] incubator-ignite git commit: # save.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-218-hdfs-only 2a472e161 -> 3fe658263


# save.


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

Branch: refs/heads/ignite-218-hdfs-only
Commit: 73cb2bc0b7b22a68a7136095b48b33d48053f2e3
Parents: 2a472e1
Author: iveselovskiy <iveselovskiy@gridgain.com>
Authored: Thu May 28 18:37:03 2015 +0300
Committer: iveselovskiy <iveselovskiy@gridgain.com>
Committed: Thu May 28 18:37:03 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/igfs/IgfsUserContext.java | 21 ++++++--------------
 1 file changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/73cb2bc0/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
index 1a91677..1242982 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsUserContext.java
@@ -17,10 +17,7 @@
 
 package org.apache.ignite.igfs;
 
-// TODO: Remove.
-import org.apache.ignite.*;
 import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
@@ -41,14 +38,11 @@ public abstract class IgfsUserContext {
      * @param clo the closure to execute
      * @param <T> The type of closure result.
      * @return the result of closure execution.
-     * @throws NullPointerException if user name is null or empty String or if the closure is null.
+     * @throws IllegalArgumentException if user name is null or empty String or if the closure is null.
      */
     public static <T> T doAs(String user, final IgniteOutClosure<T> clo) {
         if (F.isEmpty(user))
-            // use NPE to ensure that #doAs() caller will not treat this exception
-            // as the one thrown from the closure:
-            // TODO: use IllegalArgument or IgniteException
-            throw new NullPointerException("Failed to use null or empty user name.");
+            throw new IllegalArgumentException("Failed to use null or empty user name.");
 
         final String ctxUser = userStackThreadLocal.get();
 
@@ -74,7 +68,7 @@ public abstract class IgfsUserContext {
      *  public Foo myOperation() throws MyCheckedException1, MyCheckedException2 {
      *      try {
      *          return IgfsUserContext.doAs(user, new Callable<Foo>() {
-     *              @Override public Foo call() throws MyCheckedException1, MyCheckedException2 {
+     *              &#64;Override public Foo call() throws MyCheckedException1, MyCheckedException2 {
      *                  return makeSomeFoo(); // do the job
      *              }
      *          });
@@ -91,14 +85,11 @@ public abstract class IgfsUserContext {
      * @param clbl the Callable to execute
      * @param <T> The type of callable result.
      * @return the result of closure execution.
-     * @throws NullPointerException if user name is null or empty String or if the closure is null.
+     * @throws IllegalArgumentException if user name is null or empty String or if the closure is null.
      */
     public static <T> T doAs(String user, final Callable<T> clbl) throws Exception {
         if (F.isEmpty(user))
-            // use NPE to ensure that #doAs() caller will not treat this exception
-            // as the one thrown from the closure:
-            // TODO: use IllegalArgument or IgniteException
-            throw new NullPointerException("Failed to use null or empty user name.");
+            throw new IllegalArgumentException("Failed to use null or empty user name.");
 
         final String ctxUser = userStackThreadLocal.get();
 
@@ -120,7 +111,7 @@ public abstract class IgfsUserContext {
      * If this method is invoked outside of any {@link #doAs(String, IgniteOutClosure)} on the call stack, it will return null.
      * Otherwise it will return the user name set in the most lower {@link #doAs(String, IgniteOutClosure)} call
      * on the call stack.
-     * @return the current user, may be null.
+     * @return The current user, may be null.
      */
     @Nullable public static String currentUser() {
         return userStackThreadLocal.get();