diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java index 1fd5734aae..d8e8f6b9e9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java @@ -221,7 +221,6 @@ public class ProcessDialog extends Window implements EventListener, IProc private boolean isParameterPage = true; private String initialMessage; private BusyDialog progressWindow; - @SuppressWarnings("unused") private Future future; private ProcessDialogRunnable processDialogRunnable; @@ -356,6 +355,16 @@ public class ProcessDialog extends Window implements EventListener, IProc } private void onComplete() { + if (future != null) { + try { + future.get(); + } catch (Exception e) { + log.log(Level.SEVERE, e.getLocalizedMessage(), e); + if (!m_pi.isError()) { + m_pi.setSummary(e.getLocalizedMessage(), true); + } + } + } future = null; processDialogRunnable = null; unlockUI(m_pi); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java index 69df5542a7..9d20e016d4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java @@ -215,7 +215,6 @@ public class ProcessModalDialog extends Window implements EventListener, private BusyDialog progressWindow; private boolean isLocked = false; private org.adempiere.webui.apps.ProcessModalDialog.ProcessDialogRunnable processDialogRunnable; - @SuppressWarnings("unused") private Future future; /** @@ -427,6 +426,16 @@ public class ProcessModalDialog extends Window implements EventListener, } private void onComplete() { + if (future != null) { + try { + future.get(); + } catch (Exception e) { + log.log(Level.SEVERE, e.getLocalizedMessage(), e); + if (!m_pi.isError()) { + m_pi.setSummary(e.getLocalizedMessage(), true); + } + } + } future = null; processDialogRunnable = null; unlockUI(m_pi);