Merge remote-tracking branch 'remotes/apache-main/ignite-1.5' into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f587d851 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f587d851 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f587d851 Branch: refs/heads/ignite-2265 Commit: f587d851ab0468a4b13657658f00337a6859d7eb Parents: 0db011d 6c61598 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Dec 14 11:52:41 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Dec 14 11:52:41 2015 +0300 ---------------------------------------------------------------------- .gitignore | 1 + assembly/release-fabric-base.xml | 6 + examples/schema-import/README.txt | 2 +- .../examples/CacheClientBinaryExampleTest.java | 46 + .../CacheClientPortableExampleTest.java | 46 - .../ComputeClientBinaryExampleTest.java | 37 + .../ComputeClientPortableExampleTest.java | 37 - .../testsuites/IgniteExamplesSelfTestSuite.java | 15 +- .../client/impl/ClientCacheFlagsCodecTest.java | 8 +- .../src/test/resources/spring-server-node.xml | 8 +- .../test/resources/spring-server-ssl-node.xml | 8 +- modules/core/pom.xml | 4 +- .../java/org/apache/ignite/IgniteBinary.java | 124 +- .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryReader.java | 4 +- .../org/apache/ignite/cache/QueryEntity.java | 3 +- .../affinity/AffinityNodeHashResolver.java | 6 +- .../configuration/BinaryConfiguration.java | 4 +- .../ignite/internal/IgniteNodeAttributes.java | 4 +- .../binary/BinaryCachingMetadataHandler.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 813 ++++++++ .../ignite/internal/binary/BinaryContext.java | 1102 ++++++++++ .../internal/binary/BinaryEnumObjectImpl.java | 12 +- .../internal/binary/BinaryFieldAccessor.java | 20 +- .../ignite/internal/binary/BinaryFieldImpl.java | 12 +- .../internal/binary/BinaryMarshaller.java | 12 +- .../ignite/internal/binary/BinaryMetadata.java | 16 +- .../binary/BinaryMetadataCollector.java | 8 +- .../internal/binary/BinaryMetadataHandler.java | 2 +- .../internal/binary/BinaryObjectExImpl.java | 6 +- .../internal/binary/BinaryObjectImpl.java | 119 +- .../binary/BinaryObjectOffheapImpl.java | 131 +- .../internal/binary/BinaryPositionReadable.java | 47 + .../internal/binary/BinaryPrimitives.java | 382 ++++ .../internal/binary/BinaryRawWriterEx.java | 4 +- .../internal/binary/BinaryReaderExImpl.java | 298 +-- .../ignite/internal/binary/BinarySchema.java | 466 +++++ .../internal/binary/BinarySchemaRegistry.java | 172 ++ .../binary/BinaryThreadLocalContext.java | 9 +- .../ignite/internal/binary/BinaryTypeImpl.java | 10 +- .../ignite/internal/binary/BinaryUtils.java | 1859 +++++++++++++++++ .../ignite/internal/binary/BinaryWriteMode.java | 94 +- .../internal/binary/BinaryWriterExImpl.java | 278 ++- .../binary/BinaryWriterSchemaHolder.java | 19 +- .../internal/binary/GridBinaryMarshaller.java | 286 +++ .../internal/binary/GridPortableMarshaller.java | 289 --- .../binary/PortableClassDescriptor.java | 813 -------- .../ignite/internal/binary/PortableContext.java | 1102 ---------- .../binary/PortablePositionReadable.java | 47 - .../internal/binary/PortablePrimitives.java | 382 ---- .../ignite/internal/binary/PortableSchema.java | 466 ----- .../internal/binary/PortableSchemaRegistry.java | 172 -- .../ignite/internal/binary/PortableUtils.java | 1909 ------------------ .../binary/builder/BinaryAbstractLazyValue.java | 57 + .../binary/builder/BinaryBuilderEnum.java | 115 ++ .../binary/builder/BinaryBuilderReader.java | 846 ++++++++ .../BinaryBuilderSerializationAware.java | 31 + .../binary/builder/BinaryBuilderSerializer.java | 217 ++ .../builder/BinaryEnumArrayLazyValue.java | 113 ++ .../binary/builder/BinaryLazyArrayList.java | 167 ++ .../binary/builder/BinaryLazyLinkedList.java | 218 ++ .../internal/binary/builder/BinaryLazyMap.java | 221 ++ .../internal/binary/builder/BinaryLazySet.java | 92 + .../binary/builder/BinaryLazyValue.java | 28 + .../builder/BinaryModifiableLazyValue.java | 52 + .../builder/BinaryObjectArrayLazyValue.java | 90 + .../binary/builder/BinaryObjectBuilderImpl.java | 137 +- .../binary/builder/BinaryPlainBinaryObject.java | 53 + .../binary/builder/BinaryPlainLazyValue.java | 49 + .../binary/builder/BinaryValueWithType.java | 76 + .../builder/PortableAbstractLazyValue.java | 57 - .../binary/builder/PortableBuilderEnum.java | 116 -- .../binary/builder/PortableBuilderReader.java | 856 -------- .../PortableBuilderSerializationAware.java | 31 - .../builder/PortableBuilderSerializer.java | 217 -- .../builder/PortableEnumArrayLazyValue.java | 116 -- .../binary/builder/PortableLazyArrayList.java | 167 -- .../binary/builder/PortableLazyLinkedList.java | 218 -- .../binary/builder/PortableLazyMap.java | 221 -- .../binary/builder/PortableLazySet.java | 94 - .../binary/builder/PortableLazyValue.java | 28 - .../builder/PortableModifiableLazyValue.java | 52 - .../builder/PortableObjectArrayLazyValue.java | 91 - .../binary/builder/PortablePlainLazyValue.java | 49 - .../builder/PortablePlainPortableObject.java | 56 - .../binary/builder/PortableValueWithType.java | 77 - .../internal/binary/builder/package-info.java | 2 +- .../ignite/internal/binary/package-info.java | 2 +- .../streams/BinaryAbstractInputStream.java | 379 ++++ .../streams/BinaryAbstractOutputStream.java | 347 ++++ .../binary/streams/BinaryAbstractStream.java | 80 + .../binary/streams/BinaryHeapInputStream.java | 166 ++ .../binary/streams/BinaryHeapOutputStream.java | 176 ++ .../binary/streams/BinaryInputStream.java | 162 ++ .../binary/streams/BinaryMemoryAllocator.java | 57 + .../streams/BinaryMemoryAllocatorChunk.java | 117 ++ .../streams/BinaryOffheapInputStream.java | 144 ++ .../streams/BinaryOffheapOutputStream.java | 222 ++ .../binary/streams/BinaryOutputStream.java | 259 +++ .../internal/binary/streams/BinaryStream.java | 53 + .../streams/PortableAbstractInputStream.java | 379 ---- .../streams/PortableAbstractOutputStream.java | 347 ---- .../binary/streams/PortableAbstractStream.java | 80 - .../binary/streams/PortableHeapInputStream.java | 166 -- .../streams/PortableHeapOutputStream.java | 176 -- .../binary/streams/PortableInputStream.java | 163 -- .../binary/streams/PortableMemoryAllocator.java | 57 - .../streams/PortableMemoryAllocatorChunk.java | 117 -- .../streams/PortableOffheapInputStream.java | 144 -- .../streams/PortableOffheapOutputStream.java | 222 -- .../binary/streams/PortableOutputStream.java | 259 --- .../internal/binary/streams/PortableStream.java | 53 - .../internal/binary/streams/package-info.java | 2 +- .../internal/client/GridClientCacheFlag.java | 10 +- .../internal/client/GridClientCompute.java | 4 +- .../client/GridClientConfiguration.java | 4 +- .../client/impl/GridClientComputeImpl.java | 20 +- .../impl/connection/GridClientConnection.java | 6 +- .../GridClientConnectionManagerAdapter.java | 6 +- .../connection/GridClientNioTcpConnection.java | 34 +- .../internal/direct/DirectMessageWriter.java | 108 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 4 +- .../processors/cache/CacheInvokeEntry.java | 10 +- .../processors/cache/CacheLazyEntry.java | 28 +- .../processors/cache/CacheObjectContext.java | 74 +- .../processors/cache/CacheOperationContext.java | 12 +- .../processors/cache/GridCacheAdapter.java | 100 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 36 +- .../processors/cache/GridCacheEntryEx.java | 8 +- .../processors/cache/GridCacheEventManager.java | 24 +- .../processors/cache/GridCacheMapEntry.java | 54 +- .../cache/GridCacheOffheapSwapEntry.java | 4 +- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../processors/cache/GridCacheReturn.java | 10 +- .../processors/cache/IgniteCacheProxy.java | 36 +- .../processors/cache/IgniteInternalCache.java | 48 +- .../cache/binary/BinaryMetadataKey.java | 82 + .../CacheDefaultBinaryAffinityKeyMapper.java | 51 + .../CacheDefaultPortableAffinityKeyMapper.java | 51 - .../cache/binary/CacheObjectBinaryContext.java | 56 + .../binary/CacheObjectBinaryProcessor.java | 14 +- .../binary/CacheObjectBinaryProcessorImpl.java | 218 +- .../binary/CacheObjectPortableContext.java | 56 - .../cache/binary/IgniteBinaryImpl.java | 8 +- .../cache/binary/PortableMetadataKey.java | 82 - .../processors/cache/binary/package-info.java | 2 +- .../CacheDataStructuresManager.java | 11 +- .../distributed/GridDistributedLockRequest.java | 2 +- .../dht/CacheDistributedGetFutureAdapter.java | 10 +- .../distributed/dht/GridDhtCacheAdapter.java | 8 +- .../cache/distributed/dht/GridDhtGetFuture.java | 4 +- .../dht/GridPartitionedGetFuture.java | 14 +- .../dht/GridPartitionedSingleGetFuture.java | 12 +- .../dht/atomic/GridDhtAtomicCache.java | 26 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 36 +- .../distributed/near/GridNearAtomicCache.java | 10 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 6 + .../distributed/near/GridNearGetFuture.java | 22 +- .../near/GridNearTransactionalCache.java | 12 +- .../cache/distributed/near/GridNearTxLocal.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 74 +- .../query/GridCacheDistributedQueryManager.java | 8 +- .../cache/query/GridCacheQueryAdapter.java | 32 +- .../query/GridCacheQueryFutureAdapter.java | 4 +- .../cache/query/GridCacheQueryManager.java | 64 +- .../cache/query/GridCacheQueryRequest.java | 22 +- .../continuous/CacheContinuousQueryEvent.java | 8 +- .../cache/store/CacheOsStoreManager.java | 8 +- .../cache/store/CacheStoreManager.java | 10 +- .../store/GridCacheStoreManagerAdapter.java | 18 +- .../transactions/IgniteTxLocalAdapter.java | 44 +- .../cache/transactions/IgniteTxLocalEx.java | 6 +- .../cacheobject/IgniteCacheObjectProcessor.java | 16 +- .../IgniteCacheObjectProcessorImpl.java | 6 +- .../processors/cacheobject/NoOpBinary.java | 2 +- .../datastreamer/DataStreamerEntry.java | 6 +- .../datastructures/DataStructuresProcessor.java | 161 +- .../jobmetrics/GridJobMetricsProcessor.java | 8 +- .../platform/PlatformAbstractPredicate.java | 6 +- .../platform/PlatformAbstractTarget.java | 14 +- .../processors/platform/PlatformContext.java | 4 +- .../platform/PlatformContextImpl.java | 17 +- .../platform/PlatformNoopProcessor.java | 4 +- .../processors/platform/PlatformProcessor.java | 8 +- .../platform/PlatformProcessorImpl.java | 34 +- .../platform/cache/PlatformCache.java | 28 +- .../cache/PlatformCacheEntryFilterImpl.java | 2 +- .../cache/PlatformCacheEntryProcessorImpl.java | 10 +- .../PlatformCachePartialUpdateException.java | 12 +- .../callback/PlatformCallbackGateway.java | 8 +- .../callback/PlatformCallbackUtils.java | 6 +- .../cluster/PlatformClusterNodeFilterImpl.java | 2 +- .../platform/compute/PlatformCompute.java | 12 +- .../datastreamer/PlatformDataStreamer.java | 10 +- .../PlatformStreamReceiverImpl.java | 16 +- .../dotnet/PlatformDotNetCacheStore.java | 12 +- .../PlatformDotNetConfigurationClosure.java | 12 +- .../dotnet/PlatformDotNetServiceImpl.java | 8 +- .../events/PlatformEventFilterListenerImpl.java | 2 +- .../platform/memory/PlatformInputStream.java | 4 +- .../platform/memory/PlatformOutputStream.java | 4 +- .../messaging/PlatformMessageFilterImpl.java | 2 +- .../services/PlatformAbstractService.java | 26 +- .../platform/services/PlatformService.java | 6 +- .../platform/services/PlatformServices.java | 26 +- .../query/GridQueryCacheObjectsIterator.java | 14 +- .../processors/query/GridQueryProcessor.java | 93 +- .../message/GridClientBinaryMetaData.java | 71 + .../message/GridClientPortableMetaData.java | 71 - .../client/message/GridClientTaskRequest.java | 14 +- .../internal/visor/util/VisorMimeTypes.java | 10 +- .../marshaller/portable/package-info.java | 22 - .../PlatformDotNetBinaryConfiguration.java | 6 +- .../dotnet/PlatformDotNetConfiguration.java | 8 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +- .../java/org/jsr166/ConcurrentHashMap8.java | 2 +- .../resources/META-INF/classnames.properties | 12 +- .../ignite/binary/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes .../ignite/binary/test1/1.1/test1-1.1.pom | 9 + .../binary/test1/maven-metadata-local.xml | 12 + .../ignite/binary/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes .../ignite/binary/test2/1.1/test2-1.1.pom | 9 + .../binary/test2/maven-metadata-local.xml | 12 + ...eJdbcStoreAbstractMultithreadedSelfTest.java | 5 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../binary/BinaryFieldsAbstractSelfTest.java | 34 +- .../binary/BinaryFieldsHeapSelfTest.java | 6 +- .../binary/BinaryFieldsOffheapSelfTest.java | 6 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 18 +- .../binary/BinaryFooterOffsetsHeapSelfTest.java | 4 +- .../BinaryFooterOffsetsOffheapSelfTest.java | 4 +- .../binary/BinaryMarshallerSelfTest.java | 344 ++-- .../BinaryObjectBuilderAdditionalSelfTest.java | 292 +-- .../binary/BinaryObjectBuilderSelfTest.java | 84 +- .../binary/GridBinaryAffinityKeySelfTest.java | 234 +++ ...GridBinaryMarshallerCtxDisabledSelfTest.java | 247 +++ .../binary/GridBinaryMetaDataSelfTest.java | 371 ++++ .../binary/GridBinaryWildcardsSelfTest.java | 464 +++++ .../binary/GridPortableAffinityKeySelfTest.java | 234 --- ...idPortableMarshallerCtxDisabledSelfTest.java | 247 --- .../binary/GridPortableMetaDataSelfTest.java | 371 ---- .../binary/GridPortableWildcardsSelfTest.java | 464 ----- .../mutabletest/GridBinaryTestClasses.java | 484 +++++ .../mutabletest/GridPortableTestClasses.java | 484 ----- .../BinaryFieldsHeapNonCompactSelfTest.java | 2 +- .../BinaryFieldsOffheapNonCompactSelfTest.java | 2 +- ...naryFooterOffsetsHeapNonCompactSelfTest.java | 2 +- ...yFooterOffsetsOffheapNonCompactSelfTest.java | 2 +- .../BinaryObjectBuilderNonCompactSelfTest.java | 2 +- .../binary/test/GridBinaryTestClass1.java | 28 + .../binary/test/GridBinaryTestClass2.java | 24 + .../binary/test/GridPortableTestClass1.java | 28 - .../binary/test/GridPortableTestClass2.java | 24 - .../test/subpackage/GridBinaryTestClass3.java | 24 + .../test/subpackage/GridPortableTestClass3.java | 24 - .../cache/GridCacheDeploymentSelfTest.java | 19 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 6 +- .../processors/cache/GridCacheTestEntryEx.java | 8 +- .../GridBinaryCacheEntryMemorySizeSelfTest.java | 48 + ...ryDuplicateIndexObjectsAbstractSelfTest.java | 161 ++ ...naryObjectsAbstractDataStreamerSelfTest.java | 2 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 56 +- .../GridCacheBinaryStoreAbstractSelfTest.java | 300 +++ .../GridCacheBinaryStoreBinariesSelfTest.java | 66 + .../GridCacheBinaryStoreObjectsSelfTest.java | 55 + ...ntNodeBinaryObjectMetadataMultinodeTest.java | 28 +- ...CacheClientNodeBinaryObjectMetadataTest.java | 2 +- .../GridCachePortableStoreAbstractSelfTest.java | 300 --- .../GridCachePortableStoreObjectsSelfTest.java | 55 - ...GridCachePortableStorePortablesSelfTest.java | 66 - ...ridPortableCacheEntryMemorySizeSelfTest.java | 48 - ...leDuplicateIndexObjectsAbstractSelfTest.java | 161 -- .../DataStreamProcessorBinarySelfTest.java | 71 + .../DataStreamProcessorPortableSelfTest.java | 71 - .../GridDataStreamerImplSelfTest.java | 22 +- .../GridCacheAffinityRoutingBinarySelfTest.java | 54 + ...ridCacheAffinityRoutingPortableSelfTest.java | 54 - ...OnlyBinaryDataStreamerMultiNodeSelfTest.java | 29 + ...BinaryDataStreamerMultithreadedSelfTest.java | 47 + ...cPartitionedOnlyBinaryMultiNodeSelfTest.java | 28 + ...titionedOnlyBinaryMultithreadedSelfTest.java | 47 + ...lyPortableDataStreamerMultiNodeSelfTest.java | 29 - ...rtableDataStreamerMultithreadedSelfTest.java | 47 - ...artitionedOnlyPortableMultiNodeSelfTest.java | 28 - ...tionedOnlyPortableMultithreadedSelfTest.java | 47 - ...sNearPartitionedByteArrayValuesSelfTest.java | 41 + ...sPartitionedOnlyByteArrayValuesSelfTest.java | 42 + ...ateIndexObjectPartitionedAtomicSelfTest.java | 38 + ...xObjectPartitionedTransactionalSelfTest.java | 41 + ...BinaryObjectsAtomicNearDisabledSelfTest.java | 2 +- .../GridCacheBinaryObjectsAtomicSelfTest.java | 2 +- ...yObjectsPartitionedNearDisabledSelfTest.java | 2 +- ...idCacheBinaryObjectsPartitionedSelfTest.java | 2 +- .../dht/GridCacheMemoryModeBinarySelfTest.java | 36 + .../GridCacheMemoryModePortableSelfTest.java | 36 - ...dCacheOffHeapTieredAtomicBinarySelfTest.java | 48 + ...acheOffHeapTieredAtomicPortableSelfTest.java | 48 - .../GridCacheOffHeapTieredBinarySelfTest.java | 48 + ...fHeapTieredEvictionAtomicBinarySelfTest.java | 96 + ...eapTieredEvictionAtomicPortableSelfTest.java | 96 - ...acheOffHeapTieredEvictionBinarySelfTest.java | 96 + ...heOffHeapTieredEvictionPortableSelfTest.java | 96 - .../GridCacheOffHeapTieredPortableSelfTest.java | 48 - ...ateIndexObjectPartitionedAtomicSelfTest.java | 38 - ...xObjectPartitionedTransactionalSelfTest.java | 41 - ...sNearPartitionedByteArrayValuesSelfTest.java | 41 - ...sPartitionedOnlyByteArrayValuesSelfTest.java | 42 - ...ridCacheBinaryObjectsReplicatedSelfTest.java | 2 +- .../GridCacheBinaryObjectsLocalSelfTest.java | 2 +- ...IgniteCacheAbstractExecutionContextTest.java | 3 - .../near/NearCachePutAllMultinodeTest.java | 167 ++ .../platform/PlatformComputeEchoTask.java | 20 +- .../session/GridSessionCheckpointSelfTest.java | 6 +- .../ignite/testframework/junits/IgniteMock.java | 6 +- .../junits/IgniteTestResources.java | 6 +- .../IgniteBinaryCacheFullApiTestSuite.java | 37 + .../testsuites/IgniteBinaryCacheTestSuite.java | 101 + .../IgniteBinaryObjectsCacheTestSuite3.java | 2 +- .../IgniteBinaryObjectsTestSuite.java | 114 ++ .../IgnitePortableCacheFullApiTestSuite.java | 37 - .../IgnitePortableCacheTestSuite.java | 101 - .../IgnitePortableObjectsTestSuite.java | 114 -- .../ignite/util/GridMessageCollectionTest.java | 34 +- .../ignite/portable/test1/1.1/test1-1.1.jar | Bin 2548 -> 0 bytes .../ignite/portable/test1/1.1/test1-1.1.pom | 9 - .../portable/test1/maven-metadata-local.xml | 12 - .../ignite/portable/test2/1.1/test2-1.1.jar | Bin 1361 -> 0 bytes .../ignite/portable/test2/1.1/test2-1.1.pom | 9 - .../portable/test2/maven-metadata-local.xml | 12 - modules/docker/1.0.0/Dockerfile | 40 + modules/docker/1.0.0/run.sh | 50 + modules/docker/1.1.0/Dockerfile | 40 + modules/docker/1.1.0/run.sh | 50 + modules/docker/1.2.0/Dockerfile | 40 + modules/docker/1.2.0/run.sh | 50 + modules/docker/1.3.0/Dockerfile | 40 + modules/docker/1.3.0/run.sh | 50 + modules/docker/1.4.0/Dockerfile | 40 + modules/docker/1.4.0/run.sh | 50 + modules/docker/Dockerfile | 41 +- modules/docker/build_users_libs.sh | 39 - modules/docker/download_ignite.sh | 49 - modules/docker/execute.sh | 62 - modules/docker/run.sh | 36 +- .../CacheDeploymentBinaryEntryProcessor.java | 35 + .../CacheDeploymentPortableEntryProcessor.java | 35 - .../apache/ignite/tests/p2p/cache/Person.java | 77 + .../ignite/tests/p2p/cache/PersonKey.java | 74 + .../processors/query/h2/IgniteH2Indexing.java | 10 +- .../h2/twostep/GridReduceQueryExecutor.java | 8 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 246 +++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 14 +- .../IgniteBinaryCacheQueryTestSuite.java | 119 ++ .../IgnitePortableCacheQueryTestSuite.java | 117 -- modules/platforms/cpp/cpp.dxg | 1722 ++++++++++++++++ parent/pom.xml | 12 +- 363 files changed, 18854 insertions(+), 16295 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f587d851/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 6f8ca2d,64a1115..cbb2c3d --- 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 @@@ -76,16 -76,12 +76,16 @@@ public class IgniteCacheP2pUnmarshallin private void readObject(ObjectInputStream is) throws IOException { throw new IOException(); } + + private void writeObject(ObjectOutputStream os) throws IOException { + throw new IOException(); + } })).getAll(); - assertTrue("Request unmarshalling failed, but error response was not sent.", portableMarshaller()); + assertTrue("Request unmarshalling failed, but error response was not sent.", binaryMarshaller()); } catch (Exception e) { - assertFalse("Unexpected exception: " + e, portableMarshaller()); + assertFalse("Unexpected exception: " + e, binaryMarshaller()); } }
