Author: Grid.Qian Date: 2010-11-05 04:45:14 -0400 (Fri, 05 Nov 2010) New Revision: 26276 Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java Log: https://jira.jboss.org/browse/JBIDE-7480 : NPE error when add a activity to a onAlarm scope 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-11-05 07:49:26 UTC (rev 26275) +++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util/ReconciliationHelper.java 2010-11-05 08:45:14 UTC (rev 26276) @@ -1007,7 +1007,14 @@ } else if (child instanceof OnEvent) { } else if (child instanceof OnAlarm) { - + Activity activity = ((OnAlarm) child).getActivity(); + if(((OnAlarm) child).getActivity() != null) { + Element childElement = ((WSDLElement)activity).getElement(); + if (childElement == null) { + childElement = ElementFactory.getInstance().createElement(((ExtensibleElement)activity), child); + ((ExtensibleElement)activity).setElement(childElement); + } + } } else if (child instanceof FaultHandler) { FaultHandler c = (FaultHandler)child; EList<Catch> _catch = c.getCatch();