From 369635536db085dd70124ace2e4ef604680148b4 Mon Sep 17 00:00:00 2001
From: Philipp Wollermann <philwo@google.com>
Date: Fri, 4 Sep 2015 15:35:24 +0000
Subject: [PATCH] sandbox: We have to move all generated outputs, not just
 regular files.

Fix for a part of bug #397.

--
MOS_MIGRATED_REVID=102343972
---
 .../devtools/build/lib/sandbox/NamespaceSandboxRunner.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
index 74649e615d7207..e16ac70e1c2c08 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/NamespaceSandboxRunner.java
@@ -163,9 +163,7 @@ private void copyOutputs(Collection<? extends ActionInput> outputs) throws IOExc
       Path source = sandboxExecRoot.getRelative(output.getExecPathString());
       Path target = execRoot.getRelative(output.getExecPathString());
       FileSystemUtils.createDirectoryAndParents(target.getParentDirectory());
-      if (source.isFile()) {
-        Files.move(new File(source.getPathString()), new File(target.getPathString()));
-      }
+      Files.move(source.getPathFile(), target.getPathFile());
     }
   }