[10/50] [abbrv] ignite git commit: Minor.
Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4c515e6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4c515e6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4c515e6
Branch: refs/heads/ignite-gg-10760
Commit: b4c515e62bc8412a2859a5a771ef3c4b38691529
Parents: 095d4b3
Author: sboikov
Authored: Mon Sep 14 11:37:36 2015 +0300
Committer: sboikov
Committed: Mon Sep 14 11:37:36 2015 +0300
--
.../dht/GridCacheTxNodeFailureSelfTest.java | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4c515e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index 1135c40..dc78003 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -36,8 +36,10 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
@@ -59,6 +61,9 @@ import static
org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
*/
@SuppressWarnings("unchecked")
public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
+/** */
+private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
/**
* @return Grid count.
*/
@@ -70,6 +75,8 @@ public class GridCacheTxNodeFailureSelfTest extends
GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
cfg.setCacheConfiguration(cacheConfiguration(gridName));
cfg.setCommunicationSpi(new BanningCommunicationSpi());
@@ -202,9 +209,8 @@ public class GridCacheTxNodeFailureSelfTest extends
GridCommonAbstractTest {
final CountDownLatch commitLatch = new CountDownLatch(1);
-if (!commit) {
+if (!commit)
communication(1).bannedClasses(Collections.singletonList(GridDhtTxPrepareRequest.class));
-}
else {
if (!backup) {
communication(2).bannedClasses(Collections.singletonList(GridDhtTxPrepareResponse.class));
@@ -389,12 +395,11 @@ public class GridCacheTxNodeFailureSelfTest extends
GridCommonAbstractTest {
}
/** {@inheritDoc} */
-@Override public void sendMessage(ClusterNode node, Message msg,
IgniteInClosure ackClosure) throws IgniteSpiException {
+@Override public void sendMessage(ClusterNode node, Message msg,
IgniteInClosure ackC) {
GridIoMessage ioMsg = (GridIoMessage)msg;
-if (!bannedClasses.contains(ioMsg.message().getClass())) {
-super.sendMessage(node, msg, ackClosure);
-}
+if (!bannedClasses.contains(ioMsg.message().getClass()))
+super.sendMessage(node, msg, ackC);
}
}
}
[10/50] [abbrv] ignite git commit: Minor fixes in Spring Caching
Minor fixes in Spring Caching
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d38a70d2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d38a70d2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d38a70d2
Branch: refs/heads/ignite-788-dev
Commit: d38a70d2c12c640624c70bd0cb5634bb65b6d041
Parents: de7e06f
Author: Valentin Kulichenko
Authored: Wed Jul 15 20:04:45 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Jul 15 20:04:45 2015 -0700
--
.../apache/ignite/cache/spring/SpringCache.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 22 +++-
2 files changed, 13 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d38a70d2/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
--
diff --git
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
index 7651fbe..08aa38b 100644
---
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
+++
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
@@ -48,7 +48,7 @@ class SpringCache implements Cache {
}
/** {@inheritDoc} */
-@Override public Cache.ValueWrapper get(Object key) {
+@Override public ValueWrapper get(Object key) {
Object val = cache.get(key);
return val != null ? new SimpleValueWrapper(val) : null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d38a70d2/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
--
diff --git
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
index afadaee..260026e 100644
---
a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
+++
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
@@ -41,15 +41,17 @@ import java.util.concurrent.*;
* you will need to do the following:
*
*
- * Start a Ignite node with configured cache in the same JVM
- * where you application is running.
+ * Start an Ignite node with proper configuration in embedded mode
+ * (i.e., in the same JVM where the application is running). It can
+ * already have predefined caches, but it's not required - caches
+ * will be created automatically on first access if needed.
*
*
- * Configure {@code GridSpringCacheManager} as a cache provider
- * in Spring application context.
+ * Configure {@code SpringCacheManager} as a cache provider
+ * in the Spring application context.
*
*
- * {@code GridSpringCacheManager} can start a node itself on its startup
+ * {@code SpringCacheManager} can start a node itself on its startup
* based on provided Ignite configuration. You can provide path to a
* Spring configuration XML file, like below (path can be absolute or
* relative to {@code IGNITE_HOME}):
@@ -61,9 +63,9 @@ import java.util.concurrent.*;
* http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/cache
http://www.springframework.org/schema/cache/spring-cache.xsd">;
* <-- Provide configuration file path. -->
- *
+ *
*
+ *
*
* <-- Use annotation-driven caching configuration. -->
*
+ *
*
*
* ...
@@ -104,7 +106,7 @@ import java.util.concurrent.*;
* http://www.springframework.org/s
