# ignite-283: Fixes 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/2482fdc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2482fdc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2482fdc9 Branch: refs/heads/ignite-283 Commit: 2482fdc91931c1002bb676a7186b5ebf8118ac94 Parents: 2deca36 Author: vozerov <voze...@gridgain.com> Authored: Wed Feb 18 17:11:42 2015 +0300 Committer: vozerov <voze...@gridgain.com> Committed: Wed Feb 18 17:11:42 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxEntry.java | 4 ++-- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2482fdc9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index c5d8a67..720d595 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -853,7 +853,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, CU.writeVersion(out, explicitVer); out.writeBoolean(grpLock); - if (conflictExpireTime != CONFLICT_EXPIRE_TIME_NOT_SET) { + if (conflictExpireTime != CU.EXPIRE_TIME_CALCULATE) { out.writeBoolean(true); out.writeLong(conflictExpireTime); } @@ -890,7 +890,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, explicitVer = CU.readVersion(in); grpLock = in.readBoolean(); - conflictExpireTime = in.readBoolean() ? in.readLong() : CONFLICT_EXPIRE_TIME_NOT_SET; + conflictExpireTime = in.readBoolean() ? in.readLong() : CU.EXPIRE_TIME_CALCULATE; conflictVer = CU.readVersion(in); expiryPlc = (ExpiryPolicy)in.readObject(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2482fdc9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 51c001e..320f7ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -3259,7 +3259,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> if (e != null) { e.expiry(expiryPlc); - e.conflictExpireTime(CONFLICT_EXPIRE_TIME_NOT_SET); + e.conflictExpireTime(CU.EXPIRE_TIME_CALCULATE); } }
