You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2015/11/06 11:51:12 UTC
[17/30] ode git commit: Use AbstractInstanceLockManager
Use AbstractInstanceLockManager
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/4a101a41
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/4a101a41
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/4a101a41
Branch: refs/heads/ODE-563
Commit: 4a101a41e853bbdae8148ac6ee7150845ac742da
Parents: 94f19ed
Author: suba <su...@cse.mrt.ac.lk>
Authored: Wed Jul 8 14:20:07 2015 +0530
Committer: suba <su...@cse.mrt.ac.lk>
Committed: Wed Jul 8 14:20:07 2015 +0530
----------------------------------------------------------------------
.../main/java/org/apache/ode/bpel/clapi/ClusterManager.java | 3 ++-
.../main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java | 2 +-
.../java/org/apache/ode/bpel/engine/InstanceLockManager.java | 6 +++---
.../apache/ode/clustering/hazelcast/HazelcastClusterImpl.java | 6 +++---
4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/4a101a41/bpel-api/src/main/java/org/apache/ode/bpel/clapi/ClusterManager.java
----------------------------------------------------------------------
diff --git a/bpel-api/src/main/java/org/apache/ode/bpel/clapi/ClusterManager.java b/bpel-api/src/main/java/org/apache/ode/bpel/clapi/ClusterManager.java
index 6f610a4..25110b4 100644
--- a/bpel-api/src/main/java/org/apache/ode/bpel/clapi/ClusterManager.java
+++ b/bpel-api/src/main/java/org/apache/ode/bpel/clapi/ClusterManager.java
@@ -19,6 +19,7 @@
package org.apache.ode.bpel.clapi;
import java.io.File;
+import org.apache.ode.bpel.engine.AbstractInstnaceLockManager;
public interface ClusterManager {
@@ -57,5 +58,5 @@ public interface ClusterManager {
void registerClusterProcessStoreMessageListener();
ClusterLock getDeploymentLock();
- ClusterLock getInstanceLock();
+ org.apache.ode.bpel.engine.AbstractInstanceLockManager getInstanceLock();
}
http://git-wip-us.apache.org/repos/asf/ode/blob/4a101a41/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
index 81d8a4c..5bef134 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
@@ -115,7 +115,7 @@ public class BpelEngineImpl implements BpelEngine {
private SharedEndpoints _sharedEps;
/** Manage instance-level locks. */
- private final AbstractInstanceLockManager _instanceLockManager;
+ private AbstractInstanceLockManager _instanceLockManager;
final Contexts _contexts;
http://git-wip-us.apache.org/repos/asf/ode/blob/4a101a41/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
----------------------------------------------------------------------
diff --git a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
index e49e8e9..652d2ec 100644
--- a/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
+++ b/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/InstanceLockManager.java
@@ -36,7 +36,7 @@ import java.util.concurrent.locks.Lock;
*
* @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m
*/
-public class InstanceLockManager {
+public class InstanceLockManager extends AbstractInstanceLockManager {
private static final Log __log = LogFactory.getLog(InstanceLockManager.class);
private final Lock _mutex = new java.util.concurrent.locks.ReentrantLock();
@@ -137,7 +137,7 @@ public class InstanceLockManager {
}
/** Exception class indicating a time-out occured while obtaining a lock. */
- public static final class TimeoutException extends Exception {
+ /*public static final class TimeoutException extends Exception {
private static final long serialVersionUID = 7247629086692580285L;
- }
+ }*/
}
http://git-wip-us.apache.org/repos/asf/ode/blob/4a101a41/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java
----------------------------------------------------------------------
diff --git a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java
index aa24947..fb25606 100644
--- a/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java
+++ b/clustering/src/main/java/org/apache/ode/clustering/hazelcast/HazelcastClusterImpl.java
@@ -48,7 +48,7 @@ public class HazelcastClusterImpl implements ClusterManager {
private ITopic<ProcessStoreClusterEvent> clusterMessageTopic;
private ClusterProcessStore _clusterProcessStore;
private ClusterLock _hazelcastDeploymentLock;
- private ClusterLock _hazelcastInstanceLock;
+ private AbstractInstanceLockManager _hazelcastInstanceLock;
public void init(File configRoot) {
@@ -82,7 +82,7 @@ public class HazelcastClusterImpl implements ClusterManager {
clusterMessageTopic = _hazelcastInstance.getTopic(HazelcastConstants.ODE_CLUSTER_MSG);
_hazelcastDeploymentLock = (ClusterLock) new HazelcastDeploymentLock(deployment_lock_map);
- _hazelcastInstanceLock = (ClusterLock) new HazelcastInstanceLock(instance_lock_map);
+ _hazelcastInstanceLock = (AbstractInstanceLockManager) new HazelcastInstanceLock(instance_lock_map);
}
}
@@ -169,7 +169,7 @@ public class HazelcastClusterImpl implements ClusterManager {
return _hazelcastDeploymentLock;
}
- public ClusterLock getInstanceLock(){
+ public AbstractInstanceLockManager getInstanceLock(){
return _hazelcastInstanceLock;
}
}