[jboss-cvs] JBossAS SVN: r101478 - in projects/vfs/branches/Branch_2_2/src: test/java/org/jboss/test/virtual/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-02-25 10:23:17 -0500 (Thu, 25 Feb 2010)
New Revision: 101478

Modified:
   projects/vfs/branches/Branch_2_2/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java
   projects/vfs/branches/Branch_2_2/src/test/java/org/jboss/test/virtual/test/SymlinkTestCase.java
Log:
No need for new canonical file - path will do.

Modified: projects/vfs/branches/Branch_2_2/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java
===================================================================
--- projects/vfs/branches/Branch_2_2/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java	2010-02-25 15:15:47 UTC (rev 101477)
+++ projects/vfs/branches/Branch_2_2/src/main/java/org/jboss/virtual/plugins/registry/DefaultVFSRegistry.java	2010-02-25 15:23:17 UTC (rev 101478)
@@ -108,11 +108,10 @@
    {
       if (forceCanonical)
       {
-         File file = new File(uri.getPath());
-         file = file.getCanonicalFile();
+         String path = new File(uri.getPath()).getCanonicalPath();
          try
          {
-            return new URI(uri.getScheme(), uri.getHost(), file.getPath(), uri.getQuery(), uri.getFragment());
+            return new URI(uri.getScheme(), uri.getHost(), path, uri.getQuery(), uri.getFragment());
          }
          catch (URISyntaxException e)
          {

Modified: projects/vfs/branches/Branch_2_2/src/test/java/org/jboss/test/virtual/test/SymlinkTestCase.java
===================================================================
--- projects/vfs/branches/Branch_2_2/src/test/java/org/jboss/test/virtual/test/SymlinkTestCase.java	2010-02-25 15:15:47 UTC (rev 101477)
+++ projects/vfs/branches/Branch_2_2/src/test/java/org/jboss/test/virtual/test/SymlinkTestCase.java	2010-02-25 15:23:17 UTC (rev 101478)
@@ -65,10 +65,10 @@
    // enable this to run the test -- no Winz though :-)
    private static boolean supportSymlinks()
    {
-      return false;
-
-//      String os = System.getProperty("os.name");
-//      return os.contains("Win") == false;
+//      return false;
+//
+      String os = System.getProperty("os.name");
+      return os.contains("Win") == false;
    }
 
    @Override