Skip to content

Commit 5c2a4cc

Browse files
RocMarshalspuru9
andcommitted
[hotfix][test] Move some auto-closable variables into try-block to manage the closing of objects for MassiveStringSorting.java and MassiveStringValueSorting.java
Co-authored-by: spuru9 <sinhapurushottam911@gmail.com>
1 parent f9ed1d2 commit 5c2a4cc

2 files changed

Lines changed: 4 additions & 24 deletions

File tree

flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,7 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc
363363
bld.append(prefix);
364364

365365
File f = File.createTempFile("strings", "txt");
366-
BufferedWriter wrt = null;
367-
try {
368-
wrt = new BufferedWriter(new FileWriter(f));
366+
try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) {
369367

370368
for (int i = 0; i < numStrings; i++) {
371369
bld.setLength(resetValue);
@@ -380,8 +378,6 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc
380378
wrt.write(str);
381379
wrt.newLine();
382380
}
383-
} finally {
384-
wrt.close();
385381
}
386382

387383
return f;
@@ -393,9 +389,7 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws
393389
final StringBuilder bld = new StringBuilder();
394390

395391
File f = File.createTempFile("strings", "txt");
396-
BufferedWriter wrt = null;
397-
try {
398-
wrt = new BufferedWriter(new FileWriter(f));
392+
try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) {
399393

400394
for (int i = 0; i < numStrings; i++) {
401395
bld.setLength(0);
@@ -420,8 +414,6 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws
420414
wrt.write(str);
421415
wrt.newLine();
422416
}
423-
} finally {
424-
wrt.close();
425417
}
426418

427419
return f;

flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,7 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc
389389
bld.append(prefix);
390390

391391
File f = File.createTempFile("strings", "txt");
392-
BufferedWriter wrt = null;
393-
try {
394-
wrt = new BufferedWriter(new FileWriter(f));
392+
try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) {
395393

396394
for (int i = 0; i < numStrings; i++) {
397395
bld.setLength(resetValue);
@@ -406,10 +404,6 @@ private File generateFileWithStrings(int numStrings, String prefix) throws IOExc
406404
wrt.write(str);
407405
wrt.newLine();
408406
}
409-
} finally {
410-
if (wrt != null) {
411-
wrt.close();
412-
}
413407
}
414408

415409
return f;
@@ -421,9 +415,7 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws
421415
final StringBuilder bld = new StringBuilder();
422416

423417
File f = File.createTempFile("strings", "txt");
424-
BufferedWriter wrt = null;
425-
try {
426-
wrt = new BufferedWriter(new FileWriter(f));
418+
try (BufferedWriter wrt = new BufferedWriter(new FileWriter(f))) {
427419

428420
for (int i = 0; i < numStrings; i++) {
429421
bld.setLength(0);
@@ -448,10 +440,6 @@ private File generateFileWithStringTuples(int numStrings, String prefix) throws
448440
wrt.write(str);
449441
wrt.newLine();
450442
}
451-
} finally {
452-
if (wrt != null) {
453-
wrt.close();
454-
}
455443
}
456444

457445
return f;

0 commit comments

Comments
 (0)