[Fix] Properly handle UserMessageException has a warning in services
This commit is contained in:
parent
9f44738eac
commit
1b18366090
|
@ -1824,7 +1824,7 @@ public abstract class AbstractTransaction implements StrolchTransaction {
|
||||||
sb.append(", close="); //$NON-NLS-1$
|
sb.append(", close="); //$NON-NLS-1$
|
||||||
sb.append(formatNanoDuration(closeDuration));
|
sb.append(formatNanoDuration(closeDuration));
|
||||||
}
|
}
|
||||||
logger.error(sb.toString());
|
logger.warn(sb.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void handleFailure(boolean throwEx, long closeStartNanos, Exception e) {
|
private void handleFailure(boolean throwEx, long closeStartNanos, Exception e) {
|
||||||
|
|
|
@ -570,12 +570,15 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
U result = getResultInstance();
|
U result = getResultInstance();
|
||||||
result.setState(ServiceResultState.EXCEPTION);
|
|
||||||
result.setMessage(e.getMessage());
|
result.setMessage(e.getMessage());
|
||||||
result.setThrowable(e);
|
|
||||||
|
|
||||||
if (e instanceof UserMessageException)
|
if (e instanceof UserMessageException) {
|
||||||
|
result.setState(ServiceResultState.WARNING);
|
||||||
result.setI18nMessage(((UserMessageException) e).getI18nMsg());
|
result.setI18nMessage(((UserMessageException) e).getI18nMsg());
|
||||||
|
} else {
|
||||||
|
result.setState(ServiceResultState.FAILED);
|
||||||
|
result.setThrowable(e);
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package li.strolch.model;
|
package li.strolch.model;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
import li.strolch.utils.I18nMessage;
|
import li.strolch.utils.I18nMessage;
|
||||||
import li.strolch.utils.dbc.DBC;
|
import li.strolch.utils.dbc.DBC;
|
||||||
|
|
||||||
|
@ -8,6 +10,7 @@ public class UserMessageException extends Exception {
|
||||||
private final I18nMessage i18nMsg;
|
private final I18nMessage i18nMsg;
|
||||||
|
|
||||||
public UserMessageException(I18nMessage i18nMsg) {
|
public UserMessageException(I18nMessage i18nMsg) {
|
||||||
|
super(i18nMsg.getMessage(Locale.getDefault()));
|
||||||
DBC.PRE.assertNotNull("i18nMsg must not be null!", i18nMsg);
|
DBC.PRE.assertNotNull("i18nMsg must not be null!", i18nMsg);
|
||||||
this.i18nMsg = i18nMsg;
|
this.i18nMsg = i18nMsg;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue