Author: Grid.Qian
Date: 2010-05-27 01:47:54 -0400 (Thu, 27 May 2010)
New Revision: 22355
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
Log:
JBIDE-6357: to trunk
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-05-27
00:23:06 UTC (rev 22354)
+++
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-05-27
05:47:54 UTC (rev 22355)
@@ -340,7 +340,7 @@
if (nearestScopeOrProcess == null)
return;
- TreeIterator iter = nearestScopeOrProcess.eAllContents();
+ TreeIterator<EObject> iter = nearestScopeOrProcess.eAllContents();
while (iter.hasNext()) {
Object object = iter.next();
@@ -390,7 +390,7 @@
if (nearestScopeOrProcess == null)
return;
- TreeIterator iter = nearestScopeOrProcess.eAllContents();
+ TreeIterator<EObject> iter = nearestScopeOrProcess.eAllContents();
while (iter.hasNext()) {
Object object = iter.next();
@@ -398,9 +398,11 @@
if (object instanceof PartnerActivity) {
PartnerActivity partnerAct = (PartnerActivity) object;
Correlations correlations = partnerAct.getCorrelations();
+ if(correlations == null){
+ continue;
+ }
EList<Correlation> list = correlations.getChildren();
for (Correlation correlation : list) {
- CorrelationSet corrSet2 = correlation.getSet();
if (corrSet.equals(correlation.getSet())) {
correlation.getElement().setAttribute(BPELConstants.AT_SET, name);
}
@@ -411,6 +413,9 @@
else if (object instanceof OnMessage) {
OnMessage onMessage = (OnMessage) object;
Correlations correlations = onMessage.getCorrelations();
+ if(correlations == null){
+ continue;
+ }
EList<Correlation> list = correlations.getChildren();
for (Correlation correlation : list) {
if (corrSet.equals(correlation.getSet())) {
@@ -422,6 +427,9 @@
} else if (object instanceof OnEvent) {
OnEvent onEvent = (OnEvent) object;
Correlations correlations = onEvent.getCorrelations();
+ if(correlations == null){
+ continue;
+ }
EList<Correlation> list = correlations.getChildren();
for (Correlation correlation : list) {
if (corrSet.equals(correlation.getSet())) {
@@ -446,7 +454,7 @@
if (nearestScopeOrProcess == null)
return;
- TreeIterator iter = nearestScopeOrProcess.eAllContents();
+ TreeIterator<EObject> iter = nearestScopeOrProcess.eAllContents();
while (iter.hasNext()) {
Object object = iter.next();
@@ -517,7 +525,7 @@
* @param name
*/
private static void updateVariableNameReferencesOnScope(EObject scope, Variable
variable, String name) {
- TreeIterator iter = scope.eAllContents();
+ TreeIterator<EObject> iter = scope.eAllContents();
while (iter.hasNext()) {
Object object = iter.next();
Show replies by date