IGNITE-950 - Fixed NPE.

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

Branch: refs/heads/ignite-1753-1282
Commit: 22f867d8d4b35fda65cb765f53fe06786d7fdd0c
Parents: b4e5066
Author: Alexey Goncharuk <[email protected]>
Authored: Wed Nov 4 02:09:56 2015 +0300
Committer: Alexey Goncharuk <[email protected]>
Committed: Wed Nov 4 02:09:56 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/processors/cache/GridCacheAdapter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/22f867d8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 07a4ac7..0d0d3ff 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4680,7 +4680,7 @@ public abstract class GridCacheAdapter<K, V> implements 
IgniteInternalCache<K, V
                 OPTIMISTIC,
                 READ_COMMITTED,
                 
ctx.kernalContext().config().getTransactionConfiguration().getDefaultTxTimeout(),
-                !opCtx.skipStore(),
+                opCtx == null || !opCtx.skipStore(),
                 0);
 
             IgniteInternalFuture<T> fut = asyncOp(tx, op, opCtx);

Reply via email to