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 2C5CD18856 for ; Tue, 2 Jun 2015 03:51:11 +0000 (UTC) Received: (qmail 11478 invoked by uid 500); 2 Jun 2015 03:51:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 11437 invoked by uid 500); 2 Jun 2015 03:51:11 -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 11419 invoked by uid 99); 2 Jun 2015 03:51:11 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 03:51:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 99644CA992 for ; Tue, 2 Jun 2015 03:51:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id TA73DbxcTjqX for ; Tue, 2 Jun 2015 03:51:10 +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 7F6A147C2C for ; Tue, 2 Jun 2015 03:50:57 +0000 (UTC) Received: (qmail 10786 invoked by uid 99); 2 Jun 2015 03:50:56 -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; Tue, 02 Jun 2015 03:50:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E0062E0AF9; Tue, 2 Jun 2015 03:50:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 02 Jun 2015 03:51:24 -0000 Message-Id: <06751ea6e0c84abca7b1d86af2ec5898@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/34] incubator-ignite git commit: # IGNITE-891 - Cache store improvements # IGNITE-891 - Cache store improvements Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d9f1a7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d9f1a7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d9f1a7c Branch: refs/heads/ignite-sprint-5 Commit: 0d9f1a7c053fa00e39f231a83e5972643698dbdd Parents: 084b689 Author: Valentin Kulichenko Authored: Wed May 27 21:33:49 2015 -0700 Committer: Valentin Kulichenko Committed: Wed May 27 21:33:49 2015 -0700 ---------------------------------------------------------------------- .../cache/store/CacheStoreSessionListener.java | 2 +- .../spring/CacheSpringStoreSessionListener.java | 24 -------------------- 2 files changed, 1 insertion(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d9f1a7c/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java index b319e55..1543bf9 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSessionListener.java @@ -65,7 +65,7 @@ import javax.sql.*; * cache transaction, this listener is no-op. * *
  • - * <@ignitelink org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListener} - + * {@ignitelink org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListener} - * Hibernate-based session listener. It creates a new Hibernate * session for each Ignite session. If there is an ongoing cache * transaction, a corresponding Hibernate transaction is created http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d9f1a7c/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/CacheSpringStoreSessionListener.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/CacheSpringStoreSessionListener.java b/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/CacheSpringStoreSessionListener.java index 53fc599..0a32816 100644 --- a/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/CacheSpringStoreSessionListener.java +++ b/modules/spring/src/main/java/org/apache/ignite/cache/store/spring/CacheSpringStoreSessionListener.java @@ -61,9 +61,6 @@ public class CacheSpringStoreSessionListener implements CacheStoreSessionListene /** Data source. */ private DataSource dataSrc; - /** Propagation behavior. */ - private int propagation = TransactionDefinition.PROPAGATION_REQUIRED; - /** Logger. */ @LoggerResource private IgniteLogger log; @@ -110,26 +107,6 @@ public class CacheSpringStoreSessionListener implements CacheStoreSessionListene return dataSrc; } - /** - * Sets propagation behavior. - *

    - * This parameter is optional. - * - * @param propagation Propagation behavior. - */ - public void setPropagationBehavior(int propagation) { - this.propagation = propagation; - } - - /** - * Gets propagation behavior. - * - * @return Propagation behavior. - */ - public int getPropagationBehavior() { - return propagation; - } - /** {@inheritDoc} */ @Override public void start() throws IgniteException { if (txMgr == null && dataSrc == null) @@ -197,7 +174,6 @@ public class CacheSpringStoreSessionListener implements CacheStoreSessionListene def.setName("Ignite Tx [cache=" + (cacheName != null ? cacheName : "") + ", id=" + tx.xid() + ']'); def.setIsolationLevel(isolationLevel(tx.isolation())); - def.setPropagationBehavior(propagation); long timeoutSec = (tx.timeout() + 500) / 1000;