|
|
@@ -94,12 +94,18 @@ public class ObjectUploadController {
|
|
|
|
|
|
ObjectProp objectProp = objectNameService.getObjectProp(channelId, filename);
|
|
|
ObjectResult objectResult = putObjectService.putObject(objectProp, contentId, savedFile, filename, sha256sum1);
|
|
|
- UploadFileRet uploadFileRet = fileProcessor.process(objectResult, channelId);
|
|
|
- if (uploadFileRet == null) {
|
|
|
- putObjectService.deleteObject(objectResult.getObjectId());
|
|
|
- return WebResult.fail();
|
|
|
+ UploadFileRet uploadFileRet;
|
|
|
+ try {
|
|
|
+ uploadFileRet = fileProcessor.process(objectResult, channelId);
|
|
|
+ if (uploadFileRet != null) {
|
|
|
+ return WebResult.success(uploadFileRet);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
- return WebResult.success(uploadFileRet);
|
|
|
+
|
|
|
+ putObjectService.deleteObject(objectResult.getObjectId());
|
|
|
+ return WebResult.fail();
|
|
|
}
|
|
|
|
|
|
@AuthUser
|