[jbosstools-commits] JBoss Tools SVN: r23245 - trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util.
Author: Grid.Qian
Date: 2010-07-06 04:47:27 -0400 (Tue, 06 Jul 2010)
New Revision: 23245
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java
Log:
JBIDE-6471: commit 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-07-06
06:13:46 UTC (rev 23244)
+++
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-07-06
08:47:27 UTC (rev 23245)
@@ -685,7 +685,11 @@
System.err.println("trying to replace attribute on null element:" +
element.getClass());
return;
}
- if (isEqual(parseElement.getAttribute(attributeName), attributeValue)) {
+
+ // This is a problem in eclipse3.6, if we use parseElement.getAttribute(attributeName)
and the attribute is not in the parseElement,
+ // users add a element firstly, it is ok. But when users add the same element
secondly, we will get a NPE. It is a eclipse xml issue.
+ // So fix as below.
+ if (parseElement.getAttributes().getNamedItem(attributeName) != null &&
isEqual(parseElement.getAttribute(attributeName), attributeValue)) {
return;
}