Skip to content

Commit

Permalink
Shipmentschedule not updated after order reactivate and re-complete
Browse files Browse the repository at this point in the history
Compile error fix after left-and-right improvements;
#5960

(cherry picked from commit 37b26b4)

solved Conflict:
	de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/ModelValidationEngine.java
  • Loading branch information
metas-ts committed Jan 22, 2020
1 parent 4bbf9c2 commit 1c39fe8
Showing 1 changed file with 4 additions and 4 deletions.
Expand Up @@ -702,7 +702,7 @@ public void removeModelChange(String tableName, IModelInterceptor interceptor)
*/
public void fireModelChange(final PO po, final int changeType)
{
try (final MDCCloseable mdcCloseable = MDC.putCloseable("changeType", changeType))
try (final MDCCloseable mdcCloseable = MDC.putCloseable("changeType", changeType.toString()))
{
final Stopwatch stopwatch = Stopwatch.createStarted();

Expand Down Expand Up @@ -955,7 +955,7 @@ private void invokeModelChangeMethod(
else
{
final Stopwatch stopwatch = Stopwatch.createStarted();
try (final MDCCloseable mdcCloseable = MDC.putCloseable("interceptor", validator))
try (final MDCCloseable mdcCloseable = MDC.putCloseable("interceptor", validator.toString()))
{
// the default cause
final String error = validator.modelChange(po, changeType);
Expand Down Expand Up @@ -1072,7 +1072,7 @@ public String fireDocValidate(final Object model, final int docTiming)
public String fireDocValidate(final Object model, final DocTimingType docTiming)
{
final Stopwatch stopwatch = Stopwatch.createStarted();
try (final MDCCloseable mdcCloseable = MDC.putCloseable("docTiming", docTiming))
try (final MDCCloseable mdcCloseable = MDC.putCloseable("docTiming", docTiming.toString()))
{

if (model == null)
Expand Down Expand Up @@ -1188,7 +1188,7 @@ private void fireDocValidate(final PO po, final int docTiming, final List<ModelV
}

final Stopwatch stopwatch = Stopwatch.createStarted();
try (final MDCCloseable mdcCloseable = MDC.putCloseable("interceptor", interceptor))
try (final MDCCloseable mdcCloseable = MDC.putCloseable("interceptor", interceptor.toString()))
{
throw new AdempiereException(error);
}
Expand Down

0 comments on commit 1c39fe8

Please sign in to comment.