From 5ead23d08ca2e66902223d0248dc6ea9363d37e5 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Thu, 24 Feb 2005 16:48:45 +0000 Subject: [PATCH] -5 + 2 LOC git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277724 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/types/Path.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java index ca8aabbde..75f455b3c 100644 --- a/src/main/org/apache/tools/ant/types/Path.java +++ b/src/main/org/apache/tools/ant/types/Path.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2004 The Apache Software Foundation + * Copyright 2000-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -487,11 +487,8 @@ public class Path extends DataType implements Cloneable { *

Assume the filename is absolute if project is null.

*/ private static String resolveFile(Project project, String relativeName) { - if (project != null) { - File f = project.resolveFile(relativeName); - return f.getAbsolutePath(); - } - return relativeName; + return (project == null) ? relativeName + : project.resolveFile(relativeName).getAbsolutePath(); } /**