AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Catch runtime exceptions (e.g. IllegalStateException) when using the arbitrary data reader/writer.

Browse Source
This commit is contained in:
CalDescent 2021-08-18 16:23:46 +01:00
parent 95e905a5ae
commit 029c038a49
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -278,7 +278,7 @@ public class ArbitraryResource {
} catch (IOException | DataException e) { } catch (IOException | DataException e) {
LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage()); LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE);
} catch (IllegalStateException e) { } catch (RuntimeException e) {
LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage()); LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
} }

4
src/main/java/org/qortal/api/resource/WebsiteResource.java
View File

@ -112,7 +112,7 @@ public class WebsiteResource {
} catch (IOException | DataException e) { } catch (IOException | DataException e) {
LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage()); LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE);
} catch (IllegalStateException e) { } catch (RuntimeException e) {
LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage()); LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
} }
@ -214,7 +214,7 @@ public class WebsiteResource {
} catch (IOException | DataException e) { } catch (IOException | DataException e) {
LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage()); LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE);
} catch (IllegalStateException e) { } catch (RuntimeException e) {
LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage()); LOGGER.info("Unable to create arbitrary data file: {}", e.getMessage());
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
} }

2
src/main/java/org/qortal/controller/arbitrary/ArbitraryDataBuildManager.java
View File

@ -69,7 +69,7 @@ public class ArbitraryDataBuildManager implements Runnable {
this.removeFromQueue(resourceId); this.removeFromQueue(resourceId);
LOGGER.info("Finished building {}", queueItem); LOGGER.info("Finished building {}", queueItem);
} catch (IOException | DataException e) { } catch (IOException | DataException | RuntimeException e) {
LOGGER.info("Error building {}: {}", queueItem, e.getMessage()); LOGGER.info("Error building {}: {}", queueItem, e.getMessage());
// Something went wrong - so remove it from the queue, and add to failed builds list // Something went wrong - so remove it from the queue, and add to failed builds list
queueItem.setFailed(true); queueItem.setFailed(true);