ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [24/55] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-61
Date Sun, 08 Feb 2015 07:55:41 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java
index bc02118,d49906f..2b89fea
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java
@@@ -379,12 -383,14 +379,12 @@@ public class GridDataLoadRequest extend
                  commState.idx++;
  
              case 3:
 -                if (buf.remaining() < 1)
 -                    return false;
 +                byte depMode0 = commState.getByte("depMode");
  
 -                byte depMode0 = commState.getByte();
 +                if (!commState.lastRead())
 +                    return false;
  
-                 depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
+                 depMode = DeploymentMode.fromOrdinal(depMode0);
  
                  commState.idx++;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsAckMessage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsCommunicationMessage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDeleteMessage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java
index 1495000,ed06ecd..d81b46d
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java
@@@ -287,12 -289,14 +287,12 @@@ public class GridStreamerExecutionReque
                  commState.idx++;
  
              case 2:
 -                if (buf.remaining() < 1)
 -                    return false;
 +                byte depMode0 = commState.getByte("depMode");
  
 -                byte depMode0 = commState.getByte();
 +                if (!commState.lastRead())
 +                    return false;
  
-                 depMode = IgniteDeploymentMode.fromOrdinal(depMode0);
+                 depMode = DeploymentMode.fromOrdinal(depMode0);
  
                  commState.idx++;
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb41ce8/pom.xml
----------------------------------------------------------------------


Mime
View raw message