You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ha...@apache.org on 2012/12/20 06:07:19 UTC
svn commit: r1424329 - in /ode/trunk:
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/
jacob/src/main/java/org/apache/ode/jacob/vpu/
Author: hadrian
Date: Thu Dec 20 05:07:19 2012
New Revision: 1424329
URL: http://svn.apache.org/viewvc?rev=1424329&view=rev
Log:
ODE-983. Fix incomplete changes from previous commit
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java Thu Dec 20 05:07:19 2012
@@ -105,7 +105,7 @@ class ACTIVITYGUARD extends ACTIVITY {
dpe(_oactivity);
}
} else /* don't know all our links statuses */ {
- Set<ChannelListener> mlset = new HashSet<ChannelListener>();
+ Set<ChannelListener<?>> mlset = new HashSet<ChannelListener<?>>();
mlset.add(new TerminationChannelListener(_self.self) {
private static final long serialVersionUID = 5094153128476008961L;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java Thu Dec 20 05:07:19 2012
@@ -132,7 +132,7 @@ class EH_ALARM extends BpelJacobRunnable
public void run() {
Calendar now = Calendar.getInstance();
- Set<ChannelListener> listeners = new EventHandlerControlChannelListener(_cc) {
+ Set<ChannelListener<?>> listeners = new EventHandlerControlChannelListener(_cc) {
private static final long serialVersionUID = -7750428941445331236L;
public void stop() {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java Thu Dec 20 05:07:19 2012
@@ -158,11 +158,9 @@ class EH_EVENT extends BpelJacobRunnable
_pickResponseChannel = pickResponseChannel;
}
- @SuppressWarnings("unchecked")
public void run() {
-
if (!_active.isEmpty() || _pickResponseChannel != null) {
- HashSet<ChannelListener> mlset = new HashSet<ChannelListener>();
+ HashSet<ChannelListener<?>> mlset = new HashSet<ChannelListener<?>>();
if (!_terminated) {
mlset.add(new TerminationChannelListener(_tc) {
@@ -341,6 +339,5 @@ class EH_EVENT extends BpelJacobRunnable
_psc.completed(_fault, _comps);
}
}
-
}
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java Thu Dec 20 05:07:19 2012
@@ -78,7 +78,7 @@ class FLOW extends ACTIVITY {
public void run() {
Iterator<ChildInfo> active = active();
if (active.hasNext()) {
- Set<ChannelListener> mlSet = new HashSet<ChannelListener>();
+ Set<ChannelListener<?>> mlSet = new HashSet<ChannelListener<?>>();
mlSet.add(new TerminationChannelListener(_self.self) {
private static final long serialVersionUID = 2554750258974084466L;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java Thu Dec 20 05:07:19 2012
@@ -112,7 +112,7 @@ public class FOREACH extends ACTIVITY {
// Continuing as long as a child is active
if (active().hasNext()) {
- Set<ChannelListener> mlSet = new HashSet<ChannelListener>();
+ Set<ChannelListener<?>> mlSet = new HashSet<ChannelListener<?>>();
mlSet.add(new TerminationChannelListener(_self.self) {
private static final long serialVersionUID = 2554750257484084466L;
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java Thu Dec 20 05:07:19 2012
@@ -139,7 +139,7 @@ class SCOPE extends ACTIVITY {
public void run() {
if (_child != null || !_eventHandlers.isEmpty()) {
- HashSet<ChannelListener> mlSet = new HashSet<ChannelListener>();
+ HashSet<ChannelListener<?>> mlSet = new HashSet<ChannelListener<?>>();
// Listen to messages from our parent.
mlSet.add(new TerminationChannelListener(_self.self) {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java Thu Dec 20 05:07:19 2012
@@ -152,7 +152,7 @@ public class SCOPEACT extends ACTIVITY {
__log.debug("LINKSTATUSINTERCEPTOR: running ");
- Set<ChannelListener> mlset = new HashSet<ChannelListener>();
+ Set<ChannelListener<?>> mlset = new HashSet<ChannelListener<?>>();
if (_status == null)
mlset.add(new ValChannelListener(_self) {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java?rev=1424329&r1=1424328&r2=1424329&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java Thu Dec 20 05:07:19 2012
@@ -38,6 +38,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.ChannelListener;
@@ -59,14 +60,13 @@ import org.slf4j.LoggerFactory;
* A fast, in-memory {@link org.apache.ode.jacob.soup.ExecutionQueue} implementation.
*/
public class ExecutionQueueImpl implements ExecutionQueue {
- /** Class-level logger. */
+ public static ConcurrentHashMap<String, ObjectStreamClass> _classDescriptors =
+ new ConcurrentHashMap<String, ObjectStreamClass>();
+
private static final Logger LOG = LoggerFactory.getLogger(ExecutionQueueImpl.class);
private ClassLoader _classLoader;
- public static ConcurrentHashMap<String, ObjectStreamClass> _classDescriptors
- = new ConcurrentHashMap<String, ObjectStreamClass>();
-
/**
* Cached set of enqueued {@link Continuation} objects (i.e. those read using
* {@link #enqueueReaction(org.apache.ode.jacob.soup.Continuation)}).
@@ -634,8 +634,7 @@ public class ExecutionQueueImpl implemen
private Set<Object> _serializedChannels = new HashSet<Object>();
public ExecutionQueueOutputStream(OutputStream outputStream) throws IOException {
- // super(new GZIPOutputStream(outputStream));
- super(outputStream);
+ super(new GZIPOutputStream(outputStream));
enableReplaceObject(true);
}