1.1 --- a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java Thu Nov 15 19:54:20 2012 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java Thu Nov 15 23:07:24 2012 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -253,7 +253,8 @@
1.11 for (File f: files)
1.12 pl.add(f.toPath());
1.13 }
1.14 - pathsForLocation.put(locn, pl);
1.15 + if (!pl.isEmpty())
1.16 + pathsForLocation.put(locn, pl);
1.17 }
1.18
1.19 private void lazyInitSearchPaths() {
1.20 @@ -513,7 +514,8 @@
1.21 }
1.22
1.23 private static String getRelativePath(String packageName, String relativeName) {
1.24 - return packageName.replace(".", "/") + relativeName;
1.25 + return packageName.isEmpty()
1.26 + ? relativeName : packageName.replace(".", "/") + "/" + relativeName;
1.27 }
1.28
1.29 private static String getBaseName(String relativePath) {
