[04/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

[vozerov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/c88ab6ff/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c88ab6ff/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --cc 
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index 79e9801,4d9456a..d4a4c62
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@@ -74,16 -79,22 +78,26 @@@ public class IgniteCacheP2pUnmarshallin
                  private void readObject(ObjectInputStream is) throws 
IOException {
                      throw new IOException();
                  }
 +
 +                private void writeObject(ObjectOutputStream os) throws 
IOException {
 +                    throw new IOException();
 +                }
              })).getAll();
  
-             fail("Request unmarshalling failed, but error response was not 
sent.");
+             assertTrue("Request unmarshalling failed, but error response was 
not sent.", portableMarshaller());
          }
          catch (Exception e) {
-             // No-op.
+             assertFalse("Unexpected exception: " + e, portableMarshaller());
          }
      }
+ 
+     /**
+      * @return {@code True} if portable marshaller is configured.
+      */
+     private boolean portableMarshaller() {
+         IgniteEx kernal = (IgniteEx)ignite(0);
+ 
+         return 
!OptimizedMarshaller.class.getSimpleName().equals(kernal.context().config().getMarshaller().getClass()
+             .getSimpleName());
+     }
  }