[riftsaw-commits] riftsaw SVN: r501 - trunk/console/integration/src/main/java/org/jboss/soa/bpel/console.
Author: heiko.braun(a)jboss.com
Date: 2010-02-16 11:33:05 -0500 (Tue, 16 Feb 2010)
New Revision: 501
Modified:
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java
Log:
Fix for https://jira.jboss.org/jira/browse/RIFTSAW-136
Modified:
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java
===================================================================
---
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2010-02-16
15:29:58 UTC (rev 500)
+++
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2010-02-16
16:33:05 UTC (rev 501)
@@ -60,21 +60,25 @@
return results;
}
- public static List<ProcessInstanceRef> adoptInstances(InstanceInfoListDocument
instanceListDocument)
+ public static List<ProcessInstanceRef> adoptInstances(
+ QName procesQName, InstanceInfoListDocument instanceListDocument)
{
List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>();
for(TInstanceInfo i0 :
instanceListDocument.getInstanceInfoList().getInstanceInfoList())
{
- ProcessInstanceRef ref = new ProcessInstanceRef(
- i0.getIid(),
- encodeId(i0.getPid()),
- i0.getDtStarted().getTime(),
- null,
- false // see filter criteria when selecting instances
- );
-
- results.add(ref);
+ if(i0.getPid().equals(procesQName.toString()))
+ {
+ ProcessInstanceRef ref = new ProcessInstanceRef(
+ i0.getIid(),
+ encodeId(i0.getPid()),
+ i0.getDtStarted().getTime(),
+ null,
+ false // see filter criteria when selecting instances
+ );
+
+ results.add(ref);
+ }
}
return results;
Modified:
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java
===================================================================
---
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2010-02-16
15:29:58 UTC (rev 500)
+++
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2010-02-16
16:33:05 UTC (rev 501)
@@ -80,15 +80,16 @@
public List<ProcessInstanceRef> getProcessInstances(String definitionId)
{
String actualId = ModelAdaptor.decodeId(definitionId);
- QName qname = QName.valueOf(actualId);
+ QName processQName = QName.valueOf(actualId);
- //TODO: qname.getLocalPart() includes the version number.
- String instanceName = qname.getLocalPart().substring(0,
qname.getLocalPart().indexOf("-"));
+ //TODO: processQName.getLocalPart() includes the version number.
+ String instanceName = processQName.getLocalPart().substring(0,
processQName.getLocalPart().indexOf("-"));
InstanceInfoListDocument result =
getMgmtFacade().listInstances( // filter, order, limit
- "name="+ instanceName +" namespace=" +
qname.getNamespaceURI()+" status=active", "name", 1000);
-
- return ModelAdaptor.adoptInstances(result);
+ "name="+ instanceName +" namespace=" +
processQName.getNamespaceURI()+" status=active", "name", 1000);
+
+
+ return ModelAdaptor.adoptInstances(processQName, result);
}
public ProcessInstanceRef getProcessInstance(String instanceId)