svn commit: r764686 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java

[re...@apache.org]

Author: regisxu
Date: Tue Apr 14 06:46:08 2009
New Revision: 764686

URL: http://svn.apache.org/viewvc?rev=764686&view=rev
Log:
Apply patch for HARMONY-6126: [classlib][luni] - remove unnecessary code in java.io.File

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java?rev=764686&r1=764685&r2=764686&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java Tue Apr 14 06:46:08 2009
@@ -297,12 +297,8 @@
                 && (newLength > (uncIndex + 1) || (newLength == 2 && newPath[0] != separatorChar))) {
             newLength--;
         }
-        String tempPath = new String(newPath, 0, newLength);
-        // If it's the same keep it identical for SecurityManager purposes
-        if (!tempPath.equals(origPath)) {
-            return tempPath;
-        }
-        return origPath;
+
+        return new String(newPath, 0, newLength);
     }
 
     /**
@@ -1266,9 +1262,7 @@
         } else {
             userdir = System.getProperty("user.dir"); //$NON-NLS-1$
         }
-        if ((properPath = properPathImpl(pathBytes)) != null) {
-            return properPath;
-        }
+
         if (path.length() == 0) {
             return properPath = Util.getUTF8Bytes(userdir);
         }