changeset 174:ad75c4b21d63

6675606: javax.security.auth.login.Configuration does not recognize path with spaces Reviewed-by: chegar, xuelei
author weijun
date Thu, 10 Apr 2008 19:58:48 +0800
parents b70fc43afb8c
children c0eb84957bea
files src/share/classes/com/sun/security/auth/login/ConfigFile.java test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java
diffstat 2 files changed, 58 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/security/auth/login/ConfigFile.java	Sun Apr 06 10:15:03 2008 -0700
+++ b/src/share/classes/com/sun/security/auth/login/ConfigFile.java	Thu Apr 10 19:58:48 2008 +0800
@@ -621,8 +621,14 @@
      */
     private InputStream getInputStream(URL url) throws IOException {
         if ("file".equals(url.getProtocol())) {
-            String path = url.getFile().replace('/', File.separatorChar);
-            return new FileInputStream(path);
+            try {
+                File path = new File(url.toURI());
+                return new FileInputStream(path);
+            } catch (IOException ioe) {
+                throw ioe;
+            } catch (Exception ex) {
+                throw new IOException(ex.getMessage(), ex);
+            }
         } else {
             return url.openStream();
         }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java	Thu Apr 10 19:58:48 2008 +0800
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6675606
+ * @summary javax.security.auth.login.Configuration does not recognize path with spaces
+ */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.security.auth.login.*;
+
+import java.net.URI;
+import java.security.URIParameter;
+
+public class ConfigFileWithBlank {
+    public static void main(String[] args) throws Exception {
+        File f = new File("a b c");
+        FileOutputStream fos = new FileOutputStream(f);
+        fos.write("".getBytes());
+        fos.close();
+        System.err.println(f.toURI());
+        try {
+            Configuration.getInstance("JavaLoginConfig", new URIParameter(f.toURI()));
+        } finally {
+            f.delete();
+        }
+    }
+}