Skip to content

Commit 830545a

Browse files
committed
Merge pull request commons-app#31 from brion/upload-fail-fix
Fix for crash report if network down when upload starts
2 parents e6fd988 + c1191ac commit 830545a

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

commons/src/main/java/org/wikimedia/commons/UploadService.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ private void showFailedNotification(Contribution contribution) {
276276
contribution.save();
277277
}
278278

279-
private String findUniqueFilename(String fileName) {
279+
private String findUniqueFilename(String fileName) throws IOException {
280280
return findUniqueFilename(fileName, 1);
281281
}
282282

283-
private String findUniqueFilename(String fileName, int sequenceNumber) {
283+
private String findUniqueFilename(String fileName, int sequenceNumber) throws IOException {
284284
String sequenceFileName;
285285
if (sequenceNumber == 1) {
286286
sequenceFileName = fileName;
@@ -304,18 +304,14 @@ private String findUniqueFilename(String fileName, int sequenceNumber) {
304304
}
305305
}
306306

307-
private boolean fileExistsWithName(String fileName) {
307+
private boolean fileExistsWithName(String fileName) throws IOException {
308308
MWApi api = app.getApi();
309309
ApiResult result;
310310

311-
try {
312-
result = api.action("query")
313-
.param("prop", "imageinfo")
314-
.param("titles", "File:" + fileName)
315-
.get();
316-
} catch (IOException e) {
317-
throw new RuntimeException(e);
318-
}
311+
result = api.action("query")
312+
.param("prop", "imageinfo")
313+
.param("titles", "File:" + fileName)
314+
.get();
319315

320316
ArrayList<ApiResult> nodes = result.getNodes("/api/query/pages/page/imageinfo");
321317
return nodes.size() > 0;

0 commit comments

Comments
 (0)