Merge remote-tracking branch 'origin/ignite-1.6.10' into ignite-1.6.10

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

Branch: refs/heads/ignite-ssl-hotfix
Commit: 01ca6db70933fb7f50f161a80cde9647e68a3710
Parents: 359a392 60d2754
Author: dkarachentsev <dkarachent...@gridgain.com>
Authored: Tue Oct 11 16:18:40 2016 +0300
Committer: dkarachentsev <dkarachent...@gridgain.com>
Committed: Tue Oct 11 16:18:40 2016 +0300

----------------------------------------------------------------------
 .../internal/jdbc2/JdbcResultSetSelfTest.java   |  91 ++-
 .../rendezvous/RendezvousAffinityFunction.java  |   2 +-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |   4 +-
 .../configuration/CacheConfiguration.java       |  13 +-
 .../configuration/IgniteConfiguration.java      |  18 +-
 .../internal/GridEventConsumeHandler.java       |   8 +-
 .../internal/GridJobSiblingsResponse.java       |   3 +-
 .../ignite/internal/GridKernalContext.java      |  15 +
 .../ignite/internal/GridKernalContextImpl.java  |  28 +-
 .../internal/GridMessageListenHandler.java      |   8 +-
 .../apache/ignite/internal/IgniteKernal.java    |   6 +
 .../org/apache/ignite/internal/IgnitionEx.java  | 105 ++--
 .../ignite/internal/MarshallerContextImpl.java  |   5 +-
 .../internal/binary/BinaryEnumObjectImpl.java   |   3 +-
 .../internal/binary/BinaryMarshaller.java       |   2 +-
 .../internal/binary/BinaryWriterExImpl.java     |   3 +-
 .../GridClientOptimizedMarshaller.java          |   5 +-
 .../GridClientZipOptimizedMarshaller.java       |   5 +-
 .../apache/ignite/internal/jdbc/JdbcUtils.java  |   4 +-
 .../checkpoint/GridCheckpointManager.java       |   6 +-
 .../managers/communication/GridIoManager.java   | 173 +-----
 .../deployment/GridDeploymentCommunication.java |   4 +-
 .../eventstorage/GridEventStorageManager.java   |  16 +-
 .../swapspace/GridSwapSpaceManager.java         |  13 +-
 .../processors/affinity/GridAffinityUtils.java  |   4 +-
 .../cache/CacheEntrySerializablePredicate.java  |   4 +-
 .../cache/CacheInvokeDirectResult.java          |   4 +-
 .../processors/cache/GridCacheMapEntry.java     |  13 +-
 .../processors/cache/GridCacheMessage.java      |   4 +-
 .../processors/cache/GridCacheProcessor.java    |  13 +-
 .../processors/cache/GridCacheUtils.java        |   2 +-
 .../GridDistributedLockResponse.java            |   4 +-
 .../GridDistributedTxPrepareRequest.java        |   4 +-
 .../GridDistributedTxPrepareResponse.java       |   4 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |  12 +-
 .../dht/GridDhtTxFinishResponse.java            |   4 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   4 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   2 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   4 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   4 +-
 .../GridDhtPartitionDemandMessage.java          |   4 +-
 .../preloader/GridDhtPartitionsFullMessage.java |   8 +-
 .../GridDhtPartitionsSingleMessage.java         |   8 +-
 .../distributed/near/GridNearGetResponse.java   |   4 +-
 .../near/GridNearSingleGetResponse.java         |   4 +-
 .../near/GridNearTxFinishResponse.java          |   4 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |   4 +-
 .../cache/query/GridCacheQueryRequest.java      |  12 +-
 .../cache/query/GridCacheQueryResponse.java     |   4 +-
 .../cache/query/GridCacheSqlQuery.java          |   4 +-
 .../continuous/CacheContinuousQueryHandler.java |   4 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   4 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   6 +-
 .../cache/transactions/IgniteTxEntry.java       |   5 +-
 .../version/GridCacheRawVersionedEntry.java     |   8 +-
 .../IgniteCacheObjectProcessorImpl.java         |   3 +-
 .../processors/closure/GridClosurePolicy.java   |  51 --
 .../closure/GridClosureProcessor.java           |  96 +--
 .../processors/cluster/GridUpdateNotifier.java  | 108 +---
 .../continuous/GridContinuousProcessor.java     |   6 +-
 .../processors/continuous/StartRequestData.java |   4 +-
 .../datastreamer/DataStreamProcessor.java       |   8 +-
 .../datastreamer/DataStreamerImpl.java          |   6 +-
 .../processors/hadoop/HadoopHelper.java         |   7 +
 .../internal/processors/hadoop/HadoopJob.java   |   5 +
 .../processors/hadoop/HadoopNoopHelper.java     |   5 +
 .../processors/igfs/IgfsAckMessage.java         |   5 +-
 .../processors/igfs/IgfsDeleteMessage.java      |   5 +-
 .../internal/processors/igfs/IgfsPaths.java     |   4 +-
 .../internal/processors/igfs/IgfsServer.java    |   5 +-
 .../processors/igfs/IgfsThreadFactory.java      |  61 ++
 .../processors/job/GridJobProcessor.java        |  18 +-
 .../internal/processors/job/GridJobWorker.java  |   8 +-
 .../offheap/GridOffHeapProcessor.java           |   4 +-
 .../cpp/PlatformCppConfigurationClosure.java    |  13 +-
 .../PlatformDotNetConfigurationClosure.java     |  13 +-
 .../platform/utils/PlatformUtils.java           |   8 +-
 .../internal/processors/pool/PoolProcessor.java | 149 +++++
 .../processors/query/GridQueryProcessor.java    |  71 ++-
 .../handlers/task/GridTaskCommandHandler.java   |  10 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   4 +-
 .../service/GridServiceProcessor.java           |   9 +-
 .../processors/task/GridTaskProcessor.java      |   8 +-
 .../processors/task/GridTaskWorker.java         |  14 +-
 .../ignite/internal/util/IgniteUtils.java       | 291 +++++++--
 .../shmem/IpcSharedMemoryServerEndpoint.java    |  15 +-
 .../apache/ignite/logger/java/JavaLogger.java   |  14 +-
 .../logger/java/JavaLoggerFileHandler.java      |  10 +-
 .../ignite/marshaller/jdk/JdkMarshaller.java    |   8 +-
 .../optimized/OptimizedMarshaller.java          |  14 +-
 .../sharedfs/SharedFsCheckpointSpi.java         |   3 +-
 .../spi/checkpoint/sharedfs/SharedFsUtils.java  |   4 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   4 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |   8 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  24 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   8 +-
 .../TcpDiscoveryMulticastIpFinder.java          |   4 +-
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |   2 +-
 .../TcpDiscoveryCustomEventMessage.java         |   3 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   4 +-
 .../ignite/stream/socket/SocketStreamer.java    |   3 +-
 .../resources/META-INF/classnames.properties    |   1 -
 .../MarshallerContextLockingSelfTest.java       |   2 +-
 .../managers/GridManagerStopSelfTest.java       |   2 +
 .../GridCacheTtlManagerEvictionSelfTest.java    | 160 +++++
 .../MarshallerCacheJobRunNodeRestartTest.java   |   2 +-
 ...eEntryProcessorExternalizableFailedTest.java | 588 +++++++++++++++++++
 .../handlers/log/GridLogCommandHandlerTest.java |   5 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java | 166 ------
 .../util/future/GridFutureAdapterSelfTest.java  |   3 +
 .../ipc/shmem/IgfsSharedMemoryTestServer.java   |   4 +-
 .../IpcSharedMemoryCrashDetectionSelfTest.java  |   9 +-
 .../IpcSharedMemoryBenchmarkReader.java         |   2 +-
 .../ignite/logger/java/JavaLoggerTest.java      |   3 +-
 .../OptimizedMarshallerNodeFailoverTest.java    |   4 -
 ...heckpointSpiMultipleDirectoriesSelfTest.java |   6 +-
 .../GridAbstractCommunicationSelfTest.java      |   2 -
 ...cpCommunicationSpiMultithreadedSelfTest.java |   2 -
 .../GridSwapSpaceSpiAbstractSelfTest.java       |   2 -
 .../testframework/junits/GridAbstractTest.java  |   2 +-
 .../junits/GridTestKernalContext.java           |   1 +
 .../ignite/testframework/junits/IgniteMock.java |  10 +
 .../junits/IgniteTestResources.java             |   2 -
 .../junits/spi/GridSpiAbstractTest.java         |   2 -
 .../testsuites/IgniteBinaryBasicTestSuite.java  |   2 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |   4 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |   2 -
 .../CacheNoValueClassOnServerTestClient.java    |   2 -
 .../CacheConfigurationP2PTestClient.java        |   2 -
 .../processors/hadoop/HadoopHelperImpl.java     |  13 +
 .../processors/hadoop/impl/HadoopUtils.java     |  11 +-
 .../HadoopBasicFileSystemFactoryDelegate.java   |  16 +-
 ...HadoopKerberosFileSystemFactoryDelegate.java |   7 +-
 .../processors/hadoop/impl/v2/HadoopV2Job.java  |  13 +-
 .../hadoop/impl/v2/HadoopV2TaskContext.java     |   4 +-
 .../external/HadoopExternalTaskExecutor.java    |  13 +-
 .../child/HadoopExternalProcessStarter.java     |  10 +-
 .../HadoopExternalCommunication.java            |  10 +-
 .../communication/HadoopMarshallerFilter.java   |  13 +-
 .../hadoop/impl/HadoopPlannerMockJob.java       |   7 +
 .../impl/igfs/Hadoop1DualAbstractTest.java      |  12 +-
 ...oopSecondaryFileSystemConfigurationTest.java |  12 +
 .../HadoopExternalCommunicationSelfTest.java    |   2 +-
 .../hibernate/CacheHibernateBlobStore.java      |   4 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   4 +-
 .../cache/CacheConfigurationP2PTestServer.java  |   2 -
 .../serialization/CacheEventDeserializer.java   |   3 +-
 .../serialization/CacheEventSerializer.java     |   3 +-
 .../IgniteConfigurationTest.cs                  |  24 +-
 .../Apache.Ignite.Core/Impl/IgniteUtils.cs      |   2 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |   2 +-
 .../scala/org/apache/ignite/visor/visor.scala   |   2 +-
 .../ignite/cache/websession/WebSessionV2.java   |  20 +-
 153 files changed, 2012 insertions(+), 1025 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/01ca6db7/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

Reply via email to