Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f44924a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f44924a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f44924a4 Branch: refs/heads/ignite-901 Commit: f44924a48ff2ab6b85a735a683628a7271138bed Parents: 3518ba8 13e55b2 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 16 11:47:32 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 16 11:47:32 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 8 + RELEASE_NOTES.txt | 2 + assembly/LICENSE_FABRIC | 317 +++++++++++ assembly/LICENSE_HADOOP | 270 ++++++++++ assembly/NOTICE_FABRIC | 13 + assembly/NOTICE_HADOOP | 12 + assembly/dependencies-fabric.xml | 13 + assembly/dependencies-hadoop.xml | 12 + assembly/dependencies-visor-console.xml | 20 +- assembly/release-base.xml | 10 - assembly/release-fabric.xml | 12 + assembly/release-hadoop.xml | 12 + modules/aop/licenses/aspectj-epl-license.txt | 69 --- modules/apache-license-gen/pom.xml | 48 ++ .../src/main/resources/META-INF/licenses.txt.vm | 44 ++ .../processors/cache/IgniteCacheFutureImpl.java | 6 + .../processors/cache/IgniteCacheProxy.java | 55 +- .../util/future/GridFutureChainListener.java | 4 - .../internal/util/future/IgniteFutureImpl.java | 12 +- .../plugin/security/SecuritySubjectType.java | 3 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 32 ++ .../geospatial/licenses/jts-lgpl-license.txt | 165 ------ .../licenses/hibernate-lgpl-2.1-license.txt | 174 ------ modules/indexing/licenses/h2-epl-license.txt | 69 --- modules/mesos/licenses/jetty-epl-license.txt | 69 --- modules/mesos/pom.xml | 1 + .../apache/ignite/mesos/ClusterProperties.java | 14 + .../apache/ignite/mesos/IgniteScheduler.java | 26 +- modules/rest-http/pom.xml | 6 +- .../scalar-2.10/licenses/scala-bsd-license.txt | 18 - modules/scalar/licenses/scala-bsd-license.txt | 18 - .../licenses/cron4j-lgpl-2.1-license.txt | 174 ------ modules/slf4j/licenses/sl4j-mit-license.txt | 21 - .../spark-2.10/licenses/scala-bsd-license.txt | 18 - modules/spark/licenses/scala-bsd-license.txt | 18 - modules/ssh/licenses/jcraft-revised-bsd.txt | 28 - modules/tools/licenses/jodd-revised-bsd.txt | 21 - .../urideploy/licenses/jtidy-mit-license.txt | 50 -- modules/urideploy/pom.xml | 6 +- .../licenses/jline-bsd-license.txt | 18 - .../licenses/scala-bsd-license.txt | 18 - .../licenses/slf4j-mit-license.txt | 21 - modules/web/pom.xml | 6 +- modules/yarn/README.txt | 28 + modules/yarn/licenses/apache-2.0.txt | 202 +++++++ modules/yarn/pom.xml | 101 ++++ .../apache/ignite/yarn/ApplicationMaster.java | 400 ++++++++++++++ .../apache/ignite/yarn/ClusterProperties.java | 432 +++++++++++++++ .../org/apache/ignite/yarn/IgniteContainer.java | 84 +++ .../org/apache/ignite/yarn/IgniteProvider.java | 339 ++++++++++++ .../apache/ignite/yarn/IgniteYarnClient.java | 178 +++++++ .../org/apache/ignite/yarn/package-info.java | 22 + .../ignite/yarn/utils/IgniteYarnUtils.java | 81 +++ .../main/resources/ignite-default-config.xml | 35 ++ .../org/apache/ignite/IgniteYarnTestSuite.java | 38 ++ .../yarn/IgniteApplicationMasterSelfTest.java | 532 +++++++++++++++++++ parent/pom.xml | 55 ++ pom.xml | 2 + 58 files changed, 3420 insertions(+), 1042 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f44924a4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java index 13af004,42e31d2..9233f24 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheFutureImpl.java @@@ -36,12 -37,12 +37,17 @@@ public class IgniteCacheFutureImpl<V> e } /** {@inheritDoc} */ + @Override public <T> IgniteFuture<T> chain(IgniteClosure<? super IgniteFuture<V>, T> doneCb) { + return new IgniteCacheFutureImpl<>(chainInternal(doneCb)); + } + + /** {@inheritDoc} */ @Override protected RuntimeException convertException(IgniteCheckedException e) { + if (e instanceof IgniteFutureCancelledCheckedException || + e instanceof IgniteInterruptedCheckedException || + e instanceof IgniteFutureTimeoutCheckedException) + return U.convertException(e); + return CU.convertToCacheException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f44924a4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
