changeset 39507:e65f112c7ee9

8160518: Semicolon is not recognized as comment starting character (Kerberos) Reviewed-by: weijun
author igerasim
date Fri, 08 Jul 2016 19:38:17 +0300
parents 6bc0689352a3
children b0c063e32440
files jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java jdk/test/sun/security/krb5/config/Semicolon.java jdk/test/sun/security/krb5/config/comments.conf
diffstat 3 files changed, 54 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java	Fri Jul 08 17:56:52 2016 +0300
+++ b/jdk/src/java.security.jgss/share/classes/sun/security/krb5/Config.java	Fri Jul 08 19:38:17 2016 +0300
@@ -562,7 +562,7 @@
         boolean inDirectives = true;
         for (String line: lines) {
             line = line.trim();
-            if (line.isEmpty() || line.startsWith("#")) {
+            if (line.isEmpty() || line.startsWith("#") || line.startsWith(";")) {
                 continue;
             }
             if (inDirectives) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/config/Semicolon.java	Fri Jul 08 19:38:17 2016 +0300
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8160518
+ * @summary Semicolon is not recognized as comment starting character
+ * @modules java.security.jgss/sun.security.krb5
+ * @run main/othervm Semicolon
+ */
+
+import sun.security.krb5.Config;
+
+public class Semicolon {
+    public static void main(String[] args) throws Throwable {
+        System.setProperty("java.security.krb5.conf",
+                System.getProperty("test.src", ".") + "/comments.conf");
+        Config config = Config.getInstance();
+        config.getBooleanObject("section", "value");
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/config/comments.conf	Fri Jul 08 19:38:17 2016 +0300
@@ -0,0 +1,12 @@
+[section]
+
+#           comment
+ #          comment
+	 #  comment
+ 	#   comment
+;           comment
+ ;          comment
+	 ;  comment
+ 	;   comment
+
+value = true