Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3D1941777A for ; Thu, 11 Jun 2015 11:47:02 +0000 (UTC) Received: (qmail 28373 invoked by uid 500); 11 Jun 2015 11:47:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28345 invoked by uid 500); 11 Jun 2015 11:47:02 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 28333 invoked by uid 99); 11 Jun 2015 11:47:02 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2015 11:47:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id AED0DC095F for ; Thu, 11 Jun 2015 11:47:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id nfMyAn8dPP7Z for ; Thu, 11 Jun 2015 11:47:01 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 99618453FE for ; Thu, 11 Jun 2015 11:47:00 +0000 (UTC) Received: (qmail 26495 invoked by uid 99); 11 Jun 2015 11:47:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Jun 2015 11:47:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1AA26E05D6; Thu, 11 Jun 2015 11:47:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 11 Jun 2015 11:47:03 -0000 Message-Id: In-Reply-To: <2f198cd384eb477f918d09c7408e0030@git.apache.org> References: <2f198cd384eb477f918d09c7408e0030@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/50] [abbrv] incubator-ignite git commit: # ignite-sprint-5 fixed javadoc # ignite-sprint-5 fixed javadoc Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/14bb076c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/14bb076c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/14bb076c Branch: refs/heads/ignite-gg-10249 Commit: 14bb076c2ff6343c1681279d867c2a2bc56b4714 Parents: 0fa2853 Author: sboikov Authored: Tue Jun 9 09:00:04 2015 +0300 Committer: sboikov Committed: Tue Jun 9 09:00:04 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/IgniteSpiAdapter.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/14bb076c/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java index d095491..6e7a706 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java @@ -543,12 +543,18 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement return U.spiAttribute(this, attrName); } - /** {@inheritDoc} */ + /** + * @param obj Timeout object. + * @see IgniteSpiContext#addTimeoutObject(IgniteSpiTimeoutObject) + */ protected void addTimeoutObject(IgniteSpiTimeoutObject obj) { spiCtx.addTimeoutObject(obj); } - /** {@inheritDoc} */ + /** + * @param obj Timeout object. + * @see IgniteSpiContext#removeTimeoutObject(IgniteSpiTimeoutObject) + */ protected void removeTimeoutObject(IgniteSpiTimeoutObject obj) { spiCtx.removeTimeoutObject(obj); }