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

replaced serialization to temporary file by serialization to byte array 

and simplified the error handling to remove a findbugs warning

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@611492 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luc Maisonobe 2008-01-12 21:52:16 +00:00
parent 69c6e7d5f4
commit 925880307d
1 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/test/org/apache/commons/math/TestUtils.java
View File

@ -17,9 +17,8 @@
package org.apache.commons.math;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@ -100,57 +99,30 @@ public class TestUtils {
}
/**
* Serializes an object to a temp file and then recovers the object from the file.
* Serializes an object to a bytes array and then recovers the object from the bytes array.
* Returns the deserialized object.
*
* @param o object to serialize and recover
* @return the recovered, deseriailized object
* @return the recovered, deserialized object
*/
public static Object serializeAndRecover(Object o){
Object result = null;
File tmp = null;
FileOutputStream fo = null;
FileInputStream fi = null;
public static Object serializeAndRecover(Object o) {
try {
// serialize the Object
tmp = File.createTempFile("test",".ser");
fo = new FileOutputStream(tmp);
ObjectOutputStream so = new ObjectOutputStream(fo);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream so = new ObjectOutputStream(bos);
so.writeObject(o);
so.flush();
fo.close();
// deserialize the Object
fi = new FileInputStream(tmp);
ObjectInputStream si = new ObjectInputStream(fi);
result = si.readObject();
} catch (Exception ex) {
} finally {
if (fo != null) {
try {
fo.close();
} catch (IOException ex) {
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream si = new ObjectInputStream(bis);
return si.readObject();
} catch (IOException ioe) {
return null;
} catch (ClassNotFoundException cnfe) {
return null;
}
}
if (fi != null) {
try {
fi.close();
} catch (IOException ex) {
}
}
}
if (tmp != null) {
tmp.delete();
}
return result;
}
/**
* Verifies that serialization preserves equals and hashCode.
* Serializes the object, then recovers it and checks equals and hash code.