From 1297c4756fd1285514c5187bac57fe3f94b8aaca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D1=81=D0=B5=D0=BB=D1=91=D0=B2=20=D0=92=D0=BB?= =?UTF-8?q?=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?= Date: Thu, 20 Jun 2019 12:55:50 +0300 Subject: [PATCH] Fixed bug with Operation's executor. --- src/inport/TaskCase.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/inport/TaskCase.java b/src/inport/TaskCase.java index f33dac6..fb6cb99 100644 --- a/src/inport/TaskCase.java +++ b/src/inport/TaskCase.java @@ -718,7 +718,11 @@ public class TaskCase { { String[] items = rStr.substring(0, rStr.indexOf('[')).split(" "); - op.setExecutor(m_vessel.get(Integer.valueOf(items[0].trim()))); + MovingObject ex = m_vessel.get(Integer.valueOf(items[0].trim())); + if (ex == null) { + ex = m_bunker.get(Integer.valueOf(items[0].trim())); + } + op.setExecutor(ex); if (items.length > 1) { op.setBunker(Optional.of(m_bunker.get(Integer.valueOf(items[1].trim())))); } -- GitLab