Author: jflesch
Date: 2007-07-11 19:56:08 +0000 (Wed, 11 Jul 2007)
New Revision: 14028
Modified:
trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
Log:
Fix bug #1517 : Delete DDACheck\* files
Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2007-07-11 19:52:16 UTC
(rev 14027)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java 2007-07-11 19:56:08 UTC
(rev 14028)
@@ -224,7 +224,7 @@
public void run() {
JDialog dialog = new
JDialog(core.getMainWindow().getMainFrame(),
-
I18n.getMessage("thaw.common.pleaseWait"));
+ "
"+I18n.getMessage("thaw.common.pleaseWait"));
dialog.getContentPane().setLayout(new GridLayout(1, 1));
dialog.getContentPane().add(new
JLabel(I18n.getMessage("thaw.common.pleaseWait")));
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java 2007-07-11 19:52:16 UTC
(rev 14027)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java 2007-07-11 19:56:08 UTC
(rev 14028)
@@ -21,7 +21,8 @@
private boolean wantRead;
private boolean wantWrite;
- private String testFile;
+ private String writeTestFile;
+ private String readTestFile;
private boolean nodeCanRead;
private boolean nodeCanWrite;
@@ -67,7 +68,9 @@
protected boolean writeFile(String filename, String content) {
try {
- FileOutputStream stream = new
FileOutputStream(filename, false);
+ File file = new File(filename);
+ file.deleteOnExit();
+ FileOutputStream stream = new FileOutputStream(file,
false);
byte[] b;
try {
@@ -100,7 +103,9 @@
protected String readFile(String filename) {
String data = null;
try {
- FileInputStream stream = new FileInputStream(filename);
+ File file = new File(filename);
+ file.deleteOnExit();
+ FileInputStream stream = new FileInputStream(file);
DataInputStream dis = new DataInputStream(stream);
data = dis.readUTF();
@@ -121,6 +126,11 @@
protected boolean deleteFile(String filename) {
+ if (filename == null) {
+ Logger.error(this, "Can't delete file '(null)'!");
+ return false;
+ }
+
return (new File(filename)).delete();
}
@@ -161,12 +171,13 @@
answer.setValue("Directory", dir);
if (wantWrite) {
- testFile = msg.getValue("WriteFilename");
- writeFile(testFile,
msg.getValue("ContentToWrite"));
+ writeTestFile = msg.getValue("WriteFilename");
+ writeFile(writeTestFile,
msg.getValue("ContentToWrite"));
}
if (wantRead) {
- String data =
readFile(msg.getValue("ReadFilename"));
+ readTestFile = msg.getValue("ReadFilename");
+ String data = readFile(readTestFile);
if (data == null) {
Logger.error(this, "Thaw can't read the
file written by the node !");
@@ -194,8 +205,10 @@
"TestDDA : R : " +Boolean.toString(wantRead)
+ " ; W : "+Boolean.toString(wantWrite));
+ if (wantRead)
+ deleteFile(readTestFile);
if (wantWrite)
- deleteFile(testFile);
+ deleteFile(writeTestFile);
queueManager.getQueryManager().deleteObserver(this);
