From f73d330970eef07f57ee451d33d93550e84fb8bc Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Sat, 21 Dec 2024 17:33:50 +0200
Subject: [PATCH] fix for #30

---
 .../osom/management/ProcessCreateServiceRules.java |  5 +++++
 .../processes/ProcessOrderItemProcess.bpmn         | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java b/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java
index 8aa8166..6ca1a25 100644
--- a/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java
+++ b/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java
@@ -67,6 +67,11 @@ public class ProcessCreateServiceRules implements JavaDelegate {
 			return;
 		}
 		
+		if ( spec == null) {
+          logger.debug("\tCannot retrieve ServiceSpec:" + contextServiceSpecId);
+		  return;
+		}
+		
 
 		/*
 		 * first find all referenced ServiceSpecs of a ServiceSpec to be created
diff --git a/src/main/resources/processes/ProcessOrderItemProcess.bpmn b/src/main/resources/processes/ProcessOrderItemProcess.bpmn
index 4f386ce..a6b6489 100644
--- a/src/main/resources/processes/ProcessOrderItemProcess.bpmn
+++ b/src/main/resources/processes/ProcessOrderItemProcess.bpmn
@@ -26,6 +26,9 @@
     <sequenceFlow id="flow30" sourceRef="stActionDELETE" targetRef="stProcesOrderItemComplete"></sequenceFlow>
     <sequenceFlow id="flow31" sourceRef="stProcesOrderItemComplete" targetRef="endevent2"></sequenceFlow>
     <sequenceFlow id="flow32" sourceRef="stActionADD" targetRef="CreateServiceProcess"></sequenceFlow>
+    <sequenceFlow id="flow33" name="saction=='NONE'" sourceRef="exclusivegateway1" targetRef="endevent2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${saction=='NONE'}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_ProcessOrderItem">
     <bpmndi:BPMNPlane bpmnElement="ProcessOrderItem" id="BPMNPlane_ProcessOrderItem">
@@ -85,7 +88,7 @@
         <omgdi:waypoint x="320.0" y="367.0"></omgdi:waypoint>
         <omgdi:waypoint x="464.0" y="367.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="14.0" width="88.0" x="340.0" y="339.0"></omgdc:Bounds>
+          <omgdc:Bounds height="14.0" width="100.0" x="340.0" y="339.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28">
@@ -111,6 +114,15 @@
         <omgdi:waypoint x="515.0" y="87.0"></omgdi:waypoint>
         <omgdi:waypoint x="560.0" y="87.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow33" id="BPMNEdge_flow33">
+        <omgdi:waypoint x="320.0" y="197.0"></omgdi:waypoint>
+        <omgdi:waypoint x="319.0" y="467.0"></omgdi:waypoint>
+        <omgdi:waypoint x="867.0" y="467.0"></omgdi:waypoint>
+        <omgdi:waypoint x="867.0" y="191.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="14.0" width="100.0" x="335.0" y="449.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>
\ No newline at end of file
-- 
GitLab