Ignite-9655-merge - Fixed compilation after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bcd76e17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bcd76e17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bcd76e17 Branch: refs/heads/sprint-1 Commit: bcd76e174821a4c846c6eb84378b6e3fba251785 Parents: 7f86555 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sat Feb 14 11:08:31 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sat Feb 14 11:08:31 2015 -0800 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 1 - .../processors/cache/transactions/IgniteTxProxyImpl.java | 7 ------- 2 files changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bcd76e17/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 7c4b506..5623c3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -311,7 +311,6 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu null, null, null, - null, null); if (retVal) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bcd76e17/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java index 5157508..480ccb4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java @@ -111,13 +111,6 @@ public class IgniteTxProxyImpl<K, V> implements IgniteTxProxy, Externalizable { } } - /** - * @return Proxied transaction. - */ - public IgniteInternalTx<K, V> tx() { - return tx; - } - /** {@inheritDoc} */ @Override public IgniteUuid xid() { return tx.xid();
