You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/08/27 16:57:55 UTC
svn commit: r1517840 - in /commons/proper/jci/trunk:
core/src/main/java/org/apache/commons/jci/stores/
core/src/test/java/org/apache/commons/jci/
fam/src/test/java/org/apache/commons/jci/monitor/
Author: sebb
Date: Tue Aug 27 14:57:55 2013
New Revision: 1517840
URL: http://svn.apache.org/r1517840
Log:
JCI-67 Dubious use of mkdirs() return code
Modified:
commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java
commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java
commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java
Modified: commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java?rev=1517840&r1=1517839&r2=1517840&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java (original)
+++ commons/proper/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java Tue Aug 27 14:57:55 2013
@@ -60,10 +60,8 @@ public final class FileResourceStore imp
try {
final File file = getFile(pResourceName);
final File parent = file.getParentFile();
- if (!parent.exists()) {
- if (!parent.mkdirs()) {
+ if (!parent.mkdirs() && !parent.isDirectory()) {
throw new IOException("could not create" + parent);
- }
}
os = new FileOutputStream(file);
os.write(pData);
Modified: commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java?rev=1517840&r1=1517839&r2=1517840&view=diff
==============================================================================
--- commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java (original)
+++ commons/proper/jci/trunk/core/src/test/java/org/apache/commons/jci/AbstractTestCase.java Tue Aug 27 14:57:55 2013
@@ -58,12 +58,10 @@ public abstract class AbstractTestCase e
protected File writeFile( final String pName, final byte[] pData ) throws Exception {
final File file = new File(directory, pName);
final File parent = file.getParentFile();
- if (!parent.exists()) {
- if (!parent.mkdirs()) {
- throw new IOException("could not create" + parent);
- }
+ if (!parent.mkdirs() && !parent.isDirectory()) {
+ throw new IOException("could not create" + parent);
}
-
+
log.debug("writing file " + pName + " (" + pData.length + " bytes)");
final FileOutputStream os = new FileOutputStream(file);
@@ -79,10 +77,8 @@ public abstract class AbstractTestCase e
protected File writeFile( final String pName, final String pText ) throws Exception {
final File file = new File(directory, pName);
final File parent = file.getParentFile();
- if (!parent.exists()) {
- if (!parent.mkdirs()) {
- throw new IOException("could not create" + parent);
- }
+ if (!parent.mkdirs() && !parent.isDirectory()) {
+ throw new IOException("could not create" + parent);
}
log.debug("writing " + file);
final FileWriter writer = new FileWriter(file);
Modified: commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java?rev=1517840&r1=1517839&r2=1517840&view=diff
==============================================================================
--- commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java (original)
+++ commons/proper/jci/trunk/fam/src/test/java/org/apache/commons/jci/monitor/FilesystemAlterationMonitorTestCase.java Tue Aug 27 14:57:55 2013
@@ -68,10 +68,8 @@ public final class FilesystemAlterationM
protected File writeFile( final String pName, final byte[] pData ) throws Exception {
final File file = new File(directory, pName);
final File parent = file.getParentFile();
- if (!parent.exists()) {
- if (!parent.mkdirs()) {
- throw new IOException("could not create" + parent);
- }
+ if (!parent.mkdirs() && !parent.isDirectory()) {
+ throw new IOException("could not create" + parent);
}
log.debug("writing file " + pName + " (" + pData.length + " bytes)");
@@ -89,10 +87,8 @@ public final class FilesystemAlterationM
protected File writeFile( final String pName, final String pText ) throws Exception {
final File file = new File(directory, pName);
final File parent = file.getParentFile();
- if (!parent.exists()) {
- if (!parent.mkdirs()) {
- throw new IOException("could not create" + parent);
- }
+ if (!parent.mkdirs() && !parent.isDirectory()) {
+ throw new IOException("could not create" + parent);
}
log.debug("writing " + file);
final FileWriter writer = new FileWriter(file);