ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-2893
Date Thu, 06 Apr 2017 15:49:15 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2893 21685c2d0 -> 355902b91


ignite-2893


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

Branch: refs/heads/ignite-2893
Commit: 355902b915bcb05c008f52c59663aa549e6dee0e
Parents: 21685c2
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Apr 6 17:55:13 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Apr 6 18:49:06 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java       | 4 ++--
 .../internal/processors/cache/transactions/IgniteTxAdapter.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/355902b9/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 63c46c4..d9f3320 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
@@ -2370,7 +2370,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
             validateCacheKey(key);
 
         return syncOp(new SyncOp<EntryProcessorResult<T>>(true) {
-            @Nullable @Override public EntryProcessorResult<T> op(GridNearTxLocal tx)
+            @Override public EntryProcessorResult<T> op(GridNearTxLocal tx)
                 throws IgniteCheckedException {
                 assert topVer == null || tx.implicit();
 
@@ -2408,7 +2408,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
             validateCacheKeys(keys);
 
         return syncOp(new SyncOp<Map<K, EntryProcessorResult<T>>>(keys.size()
== 1) {
-            @Nullable @Override public Map<K, EntryProcessorResult<T>> op(GridNearTxLocal
tx)
+            @Override public Map<K, EntryProcessorResult<T>> op(GridNearTxLocal
tx)
                 throws IgniteCheckedException {
                 Map<? extends K, EntryProcessor<K, V, Object>> invokeMap = F.viewAsMap(keys,
                     new C1<K, EntryProcessor<K, V, Object>>() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/355902b9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 13ca26a..cc4f5b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1412,7 +1412,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter
implement
                     /*event*/recordEvt,
                     /*temporary*/true,
                     /*subjId*/subjId,
-                    /**closure name */recordEvt ? F.first(txEntry.entryProcessors()).get1()
: null,
+                    /*closure name */recordEvt ? F.first(txEntry.entryProcessors()).get1()
: null,
                     resolveTaskName(),
                     null,
                     keepBinary);


Mime
View raw message