commit d4c145e429d7badf3e4f37434c9574b6ed3df4e4
author Yohann Roussel <yroussel@google.com> Fri Mar 10 10:32:00 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 10:32:01 2017 +0000
tree 4a3d69fff1aa15f7f96a5cdd3c07d08aca71b0bc
parent 85cbf383df399f35c9edf979de358995950664ef
parent 95df8e072e627dc23fe1306ef654dfc28cb105e0

Merge "Make SeedFinder @Synchronized" into ub-jack

sched/src/com/android/sched/util/file/AbstractStreamFile.java

diff --git a/sched/src/com/android/sched/util/file/AbstractStreamFile.java b/sched/src/com/android/sched/util/file/AbstractStreamFile.java
index 93f9096..d9e508f 100644
--- a/sched/src/com/android/sched/util/file/AbstractStreamFile.java
+++ b/sched/src/com/android/sched/util/file/AbstractStreamFile.java
@@ -114,7 +114,7 @@
         return;
       }
     } catch (IOException e) {
-      throw new CannotCreateFileException(location);
+      throw new CannotCreateFileException(location, e);
     }
 
     throw new FileAlreadyExistsException(location);

sched/src/com/android/sched/util/file/CannotCreateFileException.java

diff --git a/sched/src/com/android/sched/util/file/CannotCreateFileException.java b/sched/src/com/android/sched/util/file/CannotCreateFileException.java
index 647e876..9fdc003 100644
--- a/sched/src/com/android/sched/util/file/CannotCreateFileException.java
+++ b/sched/src/com/android/sched/util/file/CannotCreateFileException.java
@@ -23,7 +23,7 @@
 import javax.annotation.Nonnull;
 
 /**
- * Exception when a file or directory can not be created.
+ * Exception when a file or directory cannot be created.
  */
 public class CannotCreateFileException extends SchedIOException {
   private static final long serialVersionUID = 1L;
@@ -48,6 +48,11 @@
 
   @Override
   protected String createMessage(@Nonnull String description) {
-    return description + " can not be created";
+    String message = description + " cannot be created";
+    Throwable cause = getCause();
+    if (cause != null) {
+      message += ": " + cause.getMessage();
+    }
+    return message;
   }
 }

sched/src/com/android/sched/vfs/CachedDirectFS.java

diff --git a/sched/src/com/android/sched/vfs/CachedDirectFS.java b/sched/src/com/android/sched/vfs/CachedDirectFS.java
index 8a27c35..b163798 100644
--- a/sched/src/com/android/sched/vfs/CachedDirectFS.java
+++ b/sched/src/com/android/sched/vfs/CachedDirectFS.java
@@ -454,7 +454,7 @@
     return vFile;
 
     } catch (NotFileException e) {
-      throw new CannotCreateFileException(getVFileLocation(parent, name));
+      throw new CannotCreateFileException(getVFileLocation(parent, name), e);
     }
   }
 
@@ -482,7 +482,7 @@
       return vDir;
 
     } catch (NotDirectoryException e) {
-      throw new CannotCreateFileException(getVDirLocation(parent, name));
+      throw new CannotCreateFileException(getVDirLocation(parent, name), e);
     }
   }
 

sched/src/com/android/sched/vfs/CaseInsensitiveFS.java

diff --git a/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java b/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java
index 01ff002..0a93ece 100644
--- a/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java
+++ b/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java
@@ -525,7 +525,7 @@
     try {
       return loadVDir(parent, name);
     } catch (NotDirectoryException e) {
-      throw new CannotCreateFileException(getVDirLocation(parent, name));
+      throw new CannotCreateFileException(getVDirLocation(parent, name), e);
     }
   }
 
@@ -547,7 +547,7 @@
         return original;
       }
     } catch (NotFileException e) {
-      throw new CannotCreateFileException(getVFileLocation(parent, name));
+      throw new CannotCreateFileException(getVFileLocation(parent, name), e);
     }
   }
 

sched/src/com/android/sched/vfs/InMemoryVDir.java

diff --git a/sched/src/com/android/sched/vfs/InMemoryVDir.java b/sched/src/com/android/sched/vfs/InMemoryVDir.java
index f53e8b9..041728a 100644
--- a/sched/src/com/android/sched/vfs/InMemoryVDir.java
+++ b/sched/src/com/android/sched/vfs/InMemoryVDir.java
@@ -93,7 +93,7 @@
 
       return dir;
     } catch (NotDirectoryException e) {
-      throw new CannotCreateFileException(vfs.getVDirLocation(this, name));
+      throw new CannotCreateFileException(vfs.getVDirLocation(this, name), e);
     }
   }
 
@@ -109,7 +109,7 @@
 
       return file;
     } catch (NotFileException e) {
-      throw new CannotCreateFileException(vfs.getVFileLocation(this, name));
+      throw new CannotCreateFileException(vfs.getVFileLocation(this, name), e);
     }
   }