Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 71976a7bb -> f4e9c473a
# ignite-45 - example update. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4e9c473 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4e9c473 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4e9c473 Branch: refs/heads/ignite-45 Commit: f4e9c473a5c32f9073726eb0b1283f82c951088b Parents: 71976a7 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Sun Mar 22 12:10:17 2015 -0700 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Sun Mar 22 12:10:17 2015 -0700 ---------------------------------------------------------------------- .../hibernate/CacheHibernatePersonStore.java | 37 +++++++------------- 1 file changed, 13 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4e9c473/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java index a022fb9..d6f14a0 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java @@ -204,11 +204,9 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> { /** {@inheritDoc} */ @Override public void txEnd(boolean commit) { - CacheStoreSession storeSes = session(); + Transaction tx = ses.transaction(); - Transaction tx = storeSes.transaction(); - - Map<String, Session> props = storeSes.properties(); + Map<String, Session> props = ses.properties(); Session ses = props.remove(ATTR_SES); @@ -245,47 +243,38 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> { * @return Session. */ private Session session(@Nullable Transaction tx) { - Session ses; + Session hbSes; if (tx != null) { - Map<String, Session> props = session().properties(); + Map<String, Session> props = ses.properties(); - ses = props.get(ATTR_SES); + hbSes = props.get(ATTR_SES); - if (ses == null) { - ses = sesFactory.openSession(); + if (hbSes == null) { + hbSes = sesFactory.openSession(); - ses.beginTransaction(); + hbSes.beginTransaction(); // Store session in session properties, so it can be accessed // for other operations on the same transaction. - props.put(ATTR_SES, ses); + props.put(ATTR_SES, hbSes); - System.out.println("Hibernate session open [ses=" + ses + ", tx=" + tx.xid() + "]"); + System.out.println("Hibernate session open [ses=" + hbSes + ", tx=" + tx.xid() + "]"); } } else { - ses = sesFactory.openSession(); + hbSes = sesFactory.openSession(); - ses.beginTransaction(); + hbSes.beginTransaction(); } - return ses; + return hbSes; } /** * @return Current transaction. */ @Nullable private Transaction transaction() { - CacheStoreSession ses = session(); - return ses != null ? ses.transaction() : null; } - - /** - * @return Store session. - */ - private CacheStoreSession session() { - return ses; - } }
