diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-02-02 15:10:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-02 15:10:56 +0000 |
| commit | 8d407245c4f66403bc742122011e807bc36364a3 (patch) | |
| tree | 51bc99eb7c03fce244d9400357efa6f0ba6f24ac | |
| parent | 87c311073d968e1d96e2164dde0b4e4db0e8f37d (diff) | |
| parent | 59c221e4bfbebff68fab0a8c5b7781e6af592e6e (diff) | |
| download | toolchain_jack-8d407245c4f66403bc742122011e807bc36364a3.zip toolchain_jack-8d407245c4f66403bc742122011e807bc36364a3.tar.gz toolchain_jack-8d407245c4f66403bc742122011e807bc36364a3.tar.bz2 | |
Merge "Handle Root special case in VPath.prenpendPath()" into ub-jack
| -rw-r--r-- | sched/src/com/android/sched/vfs/VPath.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sched/src/com/android/sched/vfs/VPath.java b/sched/src/com/android/sched/vfs/VPath.java index a3d1501..0eeae39 100644 --- a/sched/src/com/android/sched/vfs/VPath.java +++ b/sched/src/com/android/sched/vfs/VPath.java @@ -66,8 +66,10 @@ public final class VPath implements Cloneable { * @return the current path */ public VPath prependPath(@Nonnull VPath path) { - assert !this.equals(VPath.ROOT); - pathFragments.add(0, new VPathFragment(String.valueOf(INTERNAL_SEPARATOR), INTERNAL_SEPARATOR)); + if (!this.equals(VPath.ROOT)) { + pathFragments.add(0, + new VPathFragment(String.valueOf(INTERNAL_SEPARATOR), INTERNAL_SEPARATOR)); + } pathFragments.addAll(0, path.getPathFragments()); return this; |