Merge remote-tracking branch 'origin/sprint-2' into sprint-2

modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java

@@ -409,7 +409,7 @@ private GridClientConnectionManager createConnectionManager(UUID clientId, SSLCo
             Class<?> cls = Class.forName(ENT_CONN_MGR_CLS);
 
             Constructor<?> cons = cls.getConstructor(UUID.class, SSLContext.class, GridClientConfiguration.class,
-                Collection.class, GridClientTopology.class, Byte.class);
+                Collection.class, GridClientTopology.class, Byte.class, boolean.class);
 
             mgr = (GridClientConnectionManager)cons.newInstance(clientId, sslCtx, cfg, routers, top, marshId,
                 routerClient);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java

@@ -6185,6 +6185,8 @@ private LoadCacheClosure(String cacheName, IgniteBiPredicate<K, V> p, Object[] a
             out.writeObject(p);
 
             out.writeObject(args);
+
+            U.writeString(out, cacheName);
         }
 
         /** {@inheritDoc} */
@@ -6193,6 +6195,8 @@ private LoadCacheClosure(String cacheName, IgniteBiPredicate<K, V> p, Object[] a
             p = (IgniteBiPredicate<K, V>)in.readObject();
 
             args = (Object[])in.readObject();
+
+            cacheName = U.readString(in);
         }
 
         /** {@inheritDoc} */

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheNearReadCommittedTest.java

@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.distributed.near;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.internal.processors.cache.*;
+import org.apache.ignite.transactions.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
+
+/**
+ *
+ */
+public class IgniteCacheNearReadCommittedTest extends GridCacheAbstractSelfTest {
+    /** {@inheritDoc} */
+    @Override protected int gridCount() {
+        return 2;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected CacheDistributionMode distributionMode() {
+        return CacheDistributionMode.NEAR_PARTITIONED;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected CacheMode cacheMode() {
+        return PARTITIONED;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testReadCommittedCacheCleanup() throws Exception {
+        IgniteCache<Integer, Integer> cache = ignite(0).jcache(null);
+
+        Integer key = backupKey(cache);
+
+        cache.put(key, key);
+
+        try (Transaction tx = ignite(0).transactions().txStart(PESSIMISTIC, READ_COMMITTED)) {
+            assertEquals(key, cache.get(key));
+
+            tx.commit();
+        }
+
+        ignite(1).jcache(null).remove(key); // Remove from primary node.
+
+        assertEquals(0, cache.localSize());
+    }
+}

modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java

@@ -393,6 +393,9 @@ public static TestSuite suite() throws Exception {
         // suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class);
         // suite.addTestSuite(GridCacheVersionMultinodeTest.class);
 
+        // TODO IGNITE-285.
+        // suite.addTestSuite(IgniteCacheNearReadCommittedTest.class);
+
         return suite;
     }
 }