summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2017-12-08 12:51:50 -0500
committerdonald.g.dunne2017-12-08 12:53:50 -0500
commitecfe2fa4e47a2b22a57e49f7843ac1e921c6d586 (patch)
tree2f6382889f294ec5e9f6ad95cf5dc7992724e3da
parentfa064121111ef5bc4e76194c8cd151350aa6c795 (diff)
downloadorg.eclipse.osee-ecfe2fa4e47a2b22a57e49f7843ac1e921c6d586.zip
org.eclipse.osee-ecfe2fa4e47a2b22a57e49f7843ac1e921c6d586.tar.gz
org.eclipse.osee-ecfe2fa4e47a2b22a57e49f7843ac1e921c6d586.tar.xz
bug[ats_TW5373]: Exception in client AtsChangeSet requires restart
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImpl.java7
3 files changed, 9 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
index 91597f4..e6bfc40 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
@@ -430,7 +430,7 @@ public final class SkynetTransaction extends TransactionOperation<BranchId> {
}
public void cancel() {
- getTxMonitor().endTx(getBranch(), this);
+ getTxMonitor().cancel(getBranch(), this);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitor.java
index c7acc5a..6d61413 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitor.java
@@ -28,4 +28,6 @@ public interface TxMonitor<K> {
void rollbackTx(K key, MonitoredTx tx) throws OseeCoreException;
+ void cancel(K key, MonitoredTx tx);
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImpl.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImpl.java
index 21dca9b..5239475 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImpl.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImpl.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
* <ul>
* <li></li>
* </ul>
- *
+ *
* @author Roberto E. Escobar
*/
public final class TxMonitorImpl<K> implements TxMonitor<K> {
@@ -107,4 +107,9 @@ public final class TxMonitorImpl<K> implements TxMonitor<K> {
}
}
+ @Override
+ public void cancel(K key, MonitoredTx tx) {
+ cache.removeTx(key, tx.getUuid());
+ }
+
}