diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-02-02 11:47:37 +0100 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-02-02 11:47:37 +0100 |
| commit | 59c221e4bfbebff68fab0a8c5b7781e6af592e6e (patch) | |
| tree | 85c7742bda3941bf2080381cb19a8431efee7bdd | |
| parent | fa9fc691bcd6de39d83539130f8ad3e0fec42d5b (diff) | |
| download | toolchain_jack-59c221e4bfbebff68fab0a8c5b7781e6af592e6e.zip toolchain_jack-59c221e4bfbebff68fab0a8c5b7781e6af592e6e.tar.gz toolchain_jack-59c221e4bfbebff68fab0a8c5b7781e6af592e6e.tar.bz2 | |
Handle Root special case in VPath.prenpendPath()
I had put an assert before because I didn't think it would be used and
wanted to avoid handling the special case, but this is actually used.
Change-Id: I2806834d7a4d2e220bc38e90cd9cc77f10f0a645
| -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; |