diff options
author | Ryan D. Brooks | 2016-06-01 07:08:30 +0000 |
---|---|---|
committer | Angel Avila | 2016-06-01 07:08:30 +0000 |
commit | de190f34a36b1df492bccec98d6e7a37baf79d5f (patch) | |
tree | 3e71fc6c953416e0571be6ed5e8b89fd1f87f444 /plugins/org.eclipse.osee.framework.core.model | |
parent | 0beb7e2979dcffb5467bde99d255757e1a6bc1dc (diff) | |
download | org.eclipse.osee-de190f34a36b1df492bccec98d6e7a37baf79d5f.tar.gz org.eclipse.osee-de190f34a36b1df492bccec98d6e7a37baf79d5f.tar.xz org.eclipse.osee-de190f34a36b1df492bccec98d6e7a37baf79d5f.zip |
refactor: Use TransactionId with Conflicts
Change-Id: I9b2cd1f0d0a65aedca7683428357b9ea6d0b8f86
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.model')
-rw-r--r-- | plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java index c758fcbef8b..4576d6d1c26 100644 --- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java +++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/cache/TransactionCache.java @@ -19,6 +19,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; +import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.OseeCacheEnum; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; @@ -119,7 +120,7 @@ public class TransactionCache implements IOseeLoadingCache<TransactionRecord> { return transactionIdCache.size(); } - public TransactionRecord getPriorTransaction(TransactionRecord transactionId) throws OseeCoreException { + public TransactionRecord getPriorTransaction(TransactionToken transactionId) throws OseeCoreException { return accessor.getOrLoadPriorTransaction(this, transactionId.getId(), transactionId.getBranchId()); } |