Better work with files

dmatej · Mar 11, 2011 · 94403ec · 94403ec
1 parent 7547f14
commit 94403ec
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/com/atlassian/labs/bamboo/git/GitRepository.java b/src/main/java/com/atlassian/labs/bamboo/git/GitRepository.java
@@ -154,11 +154,7 @@ public boolean referencesDifferentRepository() {
     @Override
     public File getSourceCodeDirectory(@NotNull String s) throws RepositoryException {
         File codeDirectory = super.getSourceCodeDirectory(s);
-        try {
-            return new File(codeDirectory.getCanonicalPath() + File.separator + "checkout");  
-        } catch (IOException e) {
-            throw new RepositoryException("getSourceCodeDirectory", e);
-        }
+        return new File(codeDirectory, "checkout");
     }
 
     // Todo: Make sure we use vcsRevisionKey in cloneOrFetch
@@ -501,8 +497,8 @@ public static File getLocalCheckoutSubfolder() {
     }
 
 
-    static boolean containsValidRepo(File sourceDir) throws IOException {
-        return sourceDir.exists() &&  (new File( sourceDir.getCanonicalPath() + File.separator + ".git").exists() || new File( sourceDir.getCanonicalPath() + File.separator + "HEAD").exists()); 
+    protected static boolean containsValidRepo(File sourceDir) throws IOException {
+        return sourceDir.exists() &&  (new File(sourceDir, ".git").exists() || new File(sourceDir, "HEAD").exists());
     }
 
     boolean isOnBranch(File sourceDir, Ref branchName) throws IOException, JavaGitException {