ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [43/50] [abbrv] incubator-ignite git commit: # IGNITE-141 - Compilation fix
Date Wed, 11 Mar 2015 00:57:11 GMT
# IGNITE-141 - Compilation fix


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

Branch: refs/heads/sprint-2
Commit: 9f3380f1c746f028c48cc5d5d326199efc4df166
Parents: 4e0519a
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Mon Mar 9 21:59:00 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Mon Mar 9 21:59:00 2015 -0700

----------------------------------------------------------------------
 .../ignite/internal/managers/communication/GridIoManager.java      | 2 +-
 .../ignite/internal/processors/cache/GridCacheProcessor.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f3380f1/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 363e300..392aa39 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -442,7 +442,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             if (stopping) {
                 if (log.isDebugEnabled())
                     log.debug("Received communication message while stopping (will ignore)
[nodeId=" +
-                        nodeId + ", msg=" + cacheMsg + ']');
+                        nodeId + ", msg=" + msg + ']');
 
                 return;
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f3380f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index b5bf105..0cc5ee8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -928,7 +928,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                 ctx.addNodeAttribute(ATTR_CACHE_INTERCEPTORS, interceptors);
         }
 
-        marshallerCache().context().preloader().syncFuture().listenAsync(new CI1<IgniteInternalFuture<?>>()
{
+        marshallerCache().context().preloader().syncFuture().listen(new CI1<IgniteInternalFuture<?>>()
{
             @Override public void apply(IgniteInternalFuture<?> f) {
                 ctx.marshallerContext().onMarshallerCacheReady(ctx);
             }


Mime
View raw message