Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-1279: Update Java requirement from Java 6 to 7 

use try with resources in SerializationUtils
This commit is contained in:
pascalschumacher 2016-10-23 22:30:00 +02:00
parent dc53e49b4a
commit f9cab271b3
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/apache/commons/lang3/SerializationUtils.java
View File

@ -136,22 +136,10 @@ public class SerializationUtils {
if (outputStream == null) {
throw new IllegalArgumentException("The OutputStream must not be null");
}
ObjectOutputStream out = null;
try {
// stream closed in the finally
out = new ObjectOutputStream(outputStream);
try (ObjectOutputStream out = new ObjectOutputStream(outputStream)){
out.writeObject(obj);
} catch (final IOException ex) {
throw new SerializationException(ex);
} finally {
try {
if (out != null) {
out.close();
}
} catch (final IOException ex) { // NOPMD
// ignore close exception
}
}
}
@ -205,26 +193,12 @@ public class SerializationUtils {
if (inputStream == null) {
throw new IllegalArgumentException("The InputStream must not be null");
}
ObjectInputStream in = null;
try {
// stream closed in the finally
in = new ObjectInputStream(inputStream);
try (ObjectInputStream in = new ObjectInputStream(inputStream)) {
@SuppressWarnings("unchecked")
final T obj = (T) in.readObject();
return obj;
} catch (final ClassNotFoundException ex) {
} catch (final ClassNotFoundException | IOException ex) {
throw new SerializationException(ex);
} catch (final IOException ex) {
throw new SerializationException(ex);
} finally {
try {
if (in != null) {
in.close();
}
} catch (final IOException ex) { // NOPMD
// ignore close exception
}
}
}