RM-2526 Fix NPE found by integration tests.

This commit is contained in:
Tom Page
2016-10-10 14:45:06 +01:00
parent 2b3577d1c0
commit cb77ed71b5

View File

@@ -272,21 +272,21 @@ public class DispositionServiceImpl extends ServiceBaseImpl
final String dispositionActionName = dsNextAction.getNextActionName();
final Date dispositionActionDate = dsNextAction.getNextActionDateAsOf();
AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
{
@Override
public Void doWork()
{
@Override
public Void doWork()
nodeService.setProperty(action, PROP_DISPOSITION_AS_OF, dispositionActionDate);
if (dsNextAction.getWriteMode().equals(WriteMode.DATE_AND_NAME))
{
nodeService.setProperty(action, PROP_DISPOSITION_AS_OF, dispositionActionDate);
if (dsNextAction.getWriteMode().equals(WriteMode.DATE_AND_NAME))
{
nodeService.setProperty(action, PROP_DISPOSITION_ACTION_NAME, dispositionActionName);
}
return null;
nodeService.setProperty(action, PROP_DISPOSITION_ACTION_NAME, dispositionActionName);
}
});
return null;
}
});
dsNodeRef = dsNextAction.getDispositionNodeRef();
}
dsNodeRef = dsNextAction.getDispositionNodeRef();
}
else
{