stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7185778: javah error "Not a valid class name" on class names with dollar signs

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Jim Holmlund 2012-09-05 08:32:32 -07:00
parent 9c23b8bad0
commit 7dfe1cb86c
2 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
langtools/src/share/classes/com/sun/tools/javah/JavahTask.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2012, 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
@ -506,7 +506,7 @@ public class JavahTask implements NativeHeaderTool.NativeHeaderTask {
List<String> opts = new ArrayList<String>();
opts.add("-proc:only");
opts.addAll(javac_extras);
CompilationTask t = c.getTask(log, fileManager, diagnosticListener, opts, internalize(classes), null);
CompilationTask t = c.getTask(log, fileManager, diagnosticListener, opts, classes, null);
JavahProcessor p = new JavahProcessor(g);
t.setProcessors(Collections.singleton(p));
@ -516,14 +516,6 @@ public class JavahTask implements NativeHeaderTool.NativeHeaderTask {
return ok;
}
private List<String> internalize(List<String> classes) {
List<String> l = new ArrayList<String>();
for (String c: classes) {
l.add(c.replace('$', '.'));
}
return l;
}
private List<File> pathToFiles(String path) {
List<File> files = new ArrayList<File>();
for (String f: path.split(File.pathSeparator)) {

56
langtools/test/tools/javah/T7185778.java Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright (c) 2012, 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 7185778
* @summary javah error "Not a valid class name" on class names with dollar signs
* The first two tests are on an inner class name whose name does not contain $.
* The second two tests are on an inner class name whose name does contain $.
* The last test is on an outer class whose name contains $.
* @run main T7185778 T7185778$inner
* @run main T7185778 T7185778.inner
* @run main T7185778 T7185778$inner$
* @run main T7185778 T7185778.inner$
* @run main T7185778 xx$yy
*/
public class T7185778 {
class inner {
native byte[] xxxxx(String name);
}
class inner$ {
native byte[] xxxxx(String name);
}
static public void main(String[] args) {
int rc = com.sun.tools.javah.Main.run(args, null);
if ( rc != 0) {
throw new Error("javah returned non zero: " + rc);
}
}
}
class xx$yy {
native byte[] xxxxx(String name);
}