ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [60/64] [abbrv] incubator-ignite git commit: Fixed compilation
Date Fri, 12 Dec 2014 07:15:38 GMT
Fixed compilation


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

Branch: refs/heads/ignite-21
Commit: 8d2473d638fd1e2b72e46ee794b4070c0fdbbc92
Parents: ef93ffc
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Thu Dec 11 18:24:22 2014 +0300
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Thu Dec 11 18:24:22 2014 +0300

----------------------------------------------------------------------
 .../gridgain/scalar/examples/ScalarCacheAffinityExample1.scala | 6 ++----
 .../org/gridgain/scalar/examples/ScalarCacheQueryExample.scala | 4 +---
 .../core/src/main/java/org/apache/ignite/IgniteException.java  | 1 -
 .../src/main/scala/org/gridgain/visor/visor.scala              | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d2473d6/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
index d801082..e7aa494 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
@@ -11,15 +11,13 @@
 
 package org.gridgain.scalar.examples
 
-import org.apache.ignite.Ignite
 import org.gridgain.scalar.scalar
 import scalar._
 import org.apache.ignite._
-import org.gridgain.grid._
-import cache.affinity.GridCacheAffinityKeyMapped
-import cache.GridCacheName
 import org.jetbrains.annotations.Nullable
 import java.util.concurrent.Callable
+import org.gridgain.grid.cache.affinity.GridCacheAffinityKeyMapped
+import org.gridgain.grid.cache.GridCacheName
 
 /**
  * Example of how to collocate computations and data in GridGain using

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d2473d6/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
index b28bd7e..f29418a 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
@@ -11,12 +11,10 @@
 
 package org.gridgain.scalar.examples
 
-import org.apache.ignite.Ignite
 import org.gridgain.scalar._
 import scalar._
 import org.apache.ignite._
-import org.gridgain.grid._
-import cache._
+import org.gridgain.grid.cache._
 import GridCacheMode._
 import affinity._
 import java.util._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d2473d6/modules/core/src/main/java/org/apache/ignite/IgniteException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteException.java b/modules/core/src/main/java/org/apache/ignite/IgniteException.java
index 29c4a61..85f000f 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java
@@ -9,7 +9,6 @@
 
 package org.apache.ignite;
 
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d2473d6/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
index e1c24c0..04b3456 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
@@ -758,7 +758,7 @@ object visor extends VisorTag {
             for (i <- 0 until Int.MaxValue if mem.putIfAbsent(prefix + i, s) == null)
                 return prefix + i
 
-            throw new GridRuntimeException("No more memory.")
+            throw new IgniteException("No more memory.")
         }
     }
 
@@ -791,7 +791,7 @@ object visor extends VisorTag {
         for (i <- 0 until Int.MaxValue if mem.putIfAbsent(prefix + i, s) == null)
             return prefix + i
 
-        throw new GridRuntimeException("No more memory.")
+        throw new IgniteException("No more memory.")
     }
 
     /**


Mime
View raw message