ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [09/50] [abbrv] incubator-ignite git commit: # ignite-26
Date Tue, 03 Feb 2015 13:55:07 GMT
# ignite-26


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

Branch: refs/heads/ignite-32
Commit: c83c0ed0377dd224c63dd9dcd7f62c90b2a0b103
Parents: ca829a1
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Feb 3 11:14:42 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Feb 3 11:14:42 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/lang/IgniteFuture.java   | 4 ++--
 .../apache/ignite/visor/commands/ack/VisorAckCommand.scala   | 4 ++--
 .../org/apache/ignite/yardstick/compute/model/NoopTask.java  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c83c0ed0/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
index 740acdd..9f9e724 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteFuture.java
@@ -49,7 +49,7 @@ public interface IgniteFuture<V> extends Future<V> {
      * @return Computation result.
      * @throws IgniteInterruptedException Subclass of {@link IgniteException} thrown if the
wait was interrupted.
      * @throws IgniteFutureCancelledException Subclass of {@link IgniteException} throws
if computation was cancelled.
-     * @throws org.apache.ignite.lang.IgniteFutureTimeoutException Subclass of {@link IgniteException}
thrown if the wait was timed out.
+     * @throws IgniteFutureTimeoutException Subclass of {@link IgniteException} thrown if
the wait was timed out.
      * @throws IgniteException If computation failed.
      */
     public V get(long timeout)throws IgniteException;
@@ -63,7 +63,7 @@ public interface IgniteFuture<V> extends Future<V> {
      * @return Computation result.
      * @throws IgniteInterruptedException Subclass of {@link IgniteException} thrown if the
wait was interrupted.
      * @throws IgniteFutureCancelledException Subclass of {@link IgniteException} throws
if computation was cancelled.
-     * @throws org.apache.ignite.lang.IgniteFutureTimeoutException Subclass of {@link IgniteException}
thrown if the wait was timed out.
+     * @throws IgniteFutureTimeoutException Subclass of {@link IgniteException} thrown if
the wait was timed out.
      * @throws IgniteException If computation failed.
      */
     @Override public V get(long timeout, TimeUnit unit) throws IgniteException;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c83c0ed0/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
index b266249..be888b0 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.visor.commands.ack
 
-import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
+import org.apache.ignite.cluster.ClusterGroupEmptyException
 import org.apache.ignite.internal.visor.misc.VisorAckTask
 
 import java.util.{HashSet => JavaHashSet}
@@ -113,7 +113,7 @@ class VisorAckCommand {
                     .execute(classOf[VisorAckTask], toTaskArgument(nodeIds, msg))
             }
             catch {
-                case _: ClusterGroupEmptyCheckedException => scold("Topology is empty.")
+                case _: ClusterGroupEmptyException => scold("Topology is empty.")
                 case e: Exception => scold("System error: " + e.getMessage)
             }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c83c0ed0/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopTask.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopTask.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopTask.java
index d3cf55e..84f0f34 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopTask.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/compute/model/NoopTask.java
@@ -43,16 +43,16 @@ public class NoopTask implements ComputeTask<Object, Object> {
     /** {@inheritDoc} */
     @Override public ComputeJobResultPolicy result(
         ComputeJobResult res,
-        List<ComputeJobResult> rcvd
-    ) {
+        List<ComputeJobResult> rcvd)
+    {
         return ComputeJobResultPolicy.WAIT;
     }
 
     /** {@inheritDoc} */
     @Nullable @Override public Map<? extends ComputeJob, ClusterNode> map(
         List<ClusterNode> subgrid,
-        @Nullable Object arg
-    ) {
+        @Nullable Object arg)
+    {
         Map<ComputeJob, ClusterNode> map = new HashMap<>((int)(subgrid.size()
* jobs / 0.75));
 
         for (ClusterNode gridNode : subgrid) {


Mime
View raw message