ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [45/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-758' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-758
Date Mon, 20 Apr 2015 11:48:56 GMT
Merge branch 'ignite-758' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-758

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java


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

Branch: refs/heads/ignite-sprint-4
Commit: 7430e018d646b3892dee5c7b8640d7c3acef165b
Parents: b6bf81a e99216f
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Apr 17 17:14:21 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Apr 17 17:14:21 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java      |  4 +++-
 .../internal/processors/cache/GridCacheContext.java      |  2 +-
 .../internal/processors/cache/GridCacheProcessor.java    |  6 +++---
 .../internal/processors/cache/GridCacheProxyImpl.java    |  3 ++-
 .../internal/processors/cache/IgniteCacheProxy.java      | 11 +++++------
 .../datastreamer/DataStreamerCacheUpdaters.java          |  5 ++---
 6 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7430e018/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7430e018/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 2294e8b,22c730b..5487944
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@@ -219,11 -217,12 +219,12 @@@ public class GridCacheProxyImpl<K, V> i
  
      /** {@inheritDoc} */
      @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable() {
 -        if (opCtx.isKeepPortable())
 +        if (opCtx != null && opCtx.isKeepPortable())
              return (GridCacheProxyImpl<K1, V1>)this;
          
-         return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1,
V1>)delegate,
 -        return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx,
++        return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, 
+             (GridCacheAdapter<K1, V1>)delegate,
 -            opCtx.keepPortable());
 +            opCtx != null ? opCtx.keepPortable() : new CacheOperationContext(false, null,
true, null));
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7430e018/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------


Mime
View raw message