Fix throwing nullpointer after validation
This commit is contained in:
parent
119e93a9ff
commit
29d57017ab
1 changed files with 5 additions and 3 deletions
|
|
@ -117,7 +117,9 @@ public class SignalFacade {
|
||||||
try {
|
try {
|
||||||
ValidationUtil.validateMonitoringRequest(monitoringRequest);
|
ValidationUtil.validateMonitoringRequest(monitoringRequest);
|
||||||
} catch (SignalClientException e) {
|
} catch (SignalClientException e) {
|
||||||
signalService.rejectPackage(monitoringRequest);
|
if (monitoringRequest != null) {
|
||||||
|
signalService.rejectPackage(monitoringRequest);
|
||||||
|
}
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -174,8 +176,8 @@ public class SignalFacade {
|
||||||
|
|
||||||
private boolean isZipFile(MultipartFile file) {
|
private boolean isZipFile(MultipartFile file) {
|
||||||
return file.getContentType() != null &&
|
return file.getContentType() != null &&
|
||||||
(file.getContentType().equals("application/zip") || file.getContentType().equals("application/x-zip-compressed")) ||
|
(file.getContentType().equals("application/zip") || file.getContentType().equals("application/x-zip-compressed")) ||
|
||||||
file.getOriginalFilename() != null && file.getOriginalFilename().toLowerCase().endsWith(".zip");
|
file.getOriginalFilename() != null && file.getOriginalFilename().toLowerCase().endsWith(".zip");
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResponseEntity<MonitoringActivePackagesResponse> findActivePackages(MonitoringActivePackagesRequest activePackagesRequest) {
|
public ResponseEntity<MonitoringActivePackagesResponse> findActivePackages(MonitoringActivePackagesRequest activePackagesRequest) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue