[2/2] incubator-ignite git commit: Merge branch 'ignite-51-client-test' into ignite-51

[sboikov]

Merge branch 'ignite-51-client-test' into ignite-51

Conflicts:
        modules/core/src/main/java/org/apache/ignite/internal/util/F0.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/9123d479
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9123d479
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9123d479

Branch: refs/heads/ignite-51
Commit: 9123d47940cefe6fbaae0b385ecc57a5d83a80c0
Parents: af7cc24 2fdb49f
Author: nikolay_tikhonov <ntikho...@gridgain.com>
Authored: Fri Mar 6 13:59:16 2015 +0300
Committer: nikolay_tikhonov <ntikho...@gridgain.com>
Committed: Fri Mar 6 13:59:16 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheContext.java      |  8 ++++++
 .../cache/GridCacheProjectionImpl.java          |  2 +-
 .../org/apache/ignite/internal/util/F0.java     | 28 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9123d479/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9123d479/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
index 859077b,cc8e967..14509e8
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/F0.java
@@@ -158,21 -159,21 +159,37 @@@ public class F0 
                  return true;
              }
  
 +            @Override public void entryLocked(boolean locked) {
 +                if (p1 != null) {
 +                    for (CacheEntryPredicate p : p1) {
 +                        if (p != null)
 +                            p.entryLocked(locked);
 +                    }
 +                }
 +
 +                if (p2 != null) {
 +                    for (CacheEntryPredicate p : p2) {
 +                        if (p != null)
 +                            p.entryLocked(locked);
 +                    }
 +                }
 +            }
++
+             @Override public void prepareMarshal(GridCacheContext ctx) throws 
IgniteCheckedException {
+                 if (!e1) {
+                     assert p1 != null;
+ 
+                     for (CacheEntryPredicate p : p1)
+                         p.prepareMarshal(ctx);
+                 }
+ 
+                 if (!e2) {
+                     assert p2 != null;
+ 
+                     for (CacheEntryPredicate p : p2)
+                         p.prepareMarshal(ctx);
+                 }
+             }
          });
      }
  
@@@ -208,17 -208,16 +225,28 @@@
                  return true;
              }
  
 +            @Override public void entryLocked(boolean locked) {
 +                assert ps != null;
 +
 +                if (p != null)
 +                    p.entryLocked(locked);
 +
 +                for (CacheEntryPredicate p : ps) {
 +                    if (p != null)
 +                        p.entryLocked(locked);
 +                }
 +            }
++
+             @Override public void prepareMarshal(GridCacheContext ctx) throws 
IgniteCheckedException {
+                 assert ps != null;
+ 
+                 if (p != null)
+                     p.prepareMarshal(ctx);
+ 
+                 for (CacheEntryPredicate p : ps)
+                     if (p != null)
+                         p.prepareMarshal(ctx);
+             }
          });
      }