From 73f9baeb343da98c1a2b0cae80dad98dcb48483d Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 2 Jul 2008 16:43:15 +0000
Subject: [PATCH] revert: r7010 as it breaks asserts
SVN: 7014
---
.../cisd/common/utilities/RecursiveHardLinkMaker.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java b/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java
index 90c3101eaad..1144cbdc8fa 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java
@@ -192,18 +192,20 @@ public final class RecursiveHardLinkMaker implements IPathImmutableCopier,
public boolean copyDirectoryImmutably(File sourceDirectory, File destinationDirectory,
String targetNameOrNull)
{
- return copyFileImmutably(sourceDirectory, destinationDirectory, targetNameOrNull);
+ assert sourceDirectory != null && sourceDirectory.isDirectory();
+ assert destinationDirectory != null && destinationDirectory.isDirectory();
+ return (tryImmutableCopy(sourceDirectory, destinationDirectory, targetNameOrNull) != null);
}
//
// IFileImmutableCopier
//
- public boolean copyFileImmutably(File file, File destinationDirectory, String targetNameOrNull)
+ public boolean copyFileImmutably(File file, File destinationDirectory, String nameOrNull)
{
assert file != null && file.isFile();
assert destinationDirectory != null && destinationDirectory.isDirectory();
- return (tryImmutableCopy(file, destinationDirectory, targetNameOrNull) != null);
+ return (tryImmutableCopy(file, destinationDirectory, nameOrNull) != null);
}
private final File tryMakeCopy(final File resource, final File destinationDirectory,
--
GitLab