# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: ant/project/src/org/netbeans/spi/project/support/ant/PropertyUtils.java
--- ant/project/src/org/netbeans/spi/project/support/ant/PropertyUtils.java Base (1.40)
+++ ant/project/src/org/netbeans/spi/project/support/ant/PropertyUtils.java Locally Modified (Based On 1.40)
@@ -562,12 +562,39 @@
     /*public? */ static FileObject resolveFileObject(FileObject basedir, String filename) {
         if (RELATIVE_SLASH_SEPARATED_PATH.matcher(filename).matches()) {
             // Shortcut. Potentially much faster.
-            return basedir.getFileObject(filename);
+            File f = FileUtil.toFile(basedir);
+            File result = new File(f,filename);
+            if (!result.exists()) {
+                return null;
+            }
+            try {
+                if (result.isFile())
+                    return FileUtil.createData(result);
+                else
+                    return FileUtil.createFolder(result);
+            } catch (IOException ioe) {
+                Logger.getLogger(PropertyUtils.class.getName()).log(Level.FINER, null, ioe);
+                return null;
+            }
         } else {
             // Might be an absolute path, or \-separated, or . or .. components, etc.; use the safer method.
-            return FileUtil.toFileObject(resolveFile(FileUtil.toFile(basedir), filename));
+            //File f = FileUtil.toFile(basedir);
+            File result = resolveFile(FileUtil.toFile(basedir), filename);
+            if (!result.exists()) {
+                return null;
         }
+            try {
+                if (result.isFile())
+                    return FileUtil.createData(result);
+                else
+                    return FileUtil.createFolder(result);
+            } catch (IOException ioe) {
+                Logger.getLogger(PropertyUtils.class.getName()).log(Level.FINER, null, ioe);
+                return null;
     }
+            //return FileUtil.toFileObject(resolveFile(FileUtil.toFile(basedir), filename));
+        }
+    }
     
     /*public? */ static String resolvePath(File basedir, String path) {
         StringBuffer b = new StringBuffer();