X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fclustering%2Fservices_implementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fclustering%2Fservices_implementation%2Finternal%2FClusterManagerCommon.java;h=97d9ded6c86b864f06356ff026bd170cc6dbe4d5;hb=e640f23d9c37afac9ca51f48e155302bc65327ed;hp=90299e5ac960dcbd34c63df4cd8418c5b57ddf5f;hpb=37fa8d2f9fa05c29005df8cb39e71ead95de13a9;p=controller.git diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java index 90299e5ac9..97d9ded6c8 100644 --- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java +++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java @@ -19,13 +19,15 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.TimeUnit; + import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; import javax.transaction.NotSupportedException; import javax.transaction.RollbackException; import javax.transaction.SystemException; import javax.transaction.Transaction; -import javax.transaction.TransactionManager; + import org.apache.felix.dm.Component; import org.opendaylight.controller.clustering.services.CacheConfigException; import org.opendaylight.controller.clustering.services.CacheExistException; @@ -41,7 +43,7 @@ import org.slf4j.LoggerFactory; public abstract class ClusterManagerCommon implements IClusterServicesCommon { protected String containerName = null; - private IClusterServices clusterService = null; + protected IClusterServices clusterService = null; protected static final Logger logger = LoggerFactory .getLogger(ClusterManagerCommon.class); private ConcurrentMap cacheUpdateAware = @@ -256,6 +258,15 @@ public abstract class ClusterManagerCommon implements IClusterServicesCommon { } } + @Override + public void tbegin(long timeout, TimeUnit unit) throws NotSupportedException, SystemException { + if (this.clusterService != null) { + this.clusterService.tbegin(timeout, unit); + } else { + throw new IllegalStateException(); + } + } + @Override public void tcommit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, java.lang.SecurityException,