--- a/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java	Wed Aug 21 20:23:36 2013 -0400
+++ b/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java	Wed Aug 21 17:26:22 2013 -0700
@@ -148,7 +148,7 @@
             }
         }
 
-        final static Map<String, Package> packages = new TreeMap<String, Package>();
+        final Map<String, Package> packages = new TreeMap<String, Package>();
 
         final int maxProfile = 4;  // Three compact profiles plus full JRE
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/profiles/ProfileTest.java	Wed Aug 21 17:26:22 2013 -0700
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2013, 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 8022287
+ * @summary javac.sym.Profiles uses a static Map when it should not
+ */
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import com.sun.tools.javac.sym.Profiles;
+
+public class ProfileTest {
+    public static void main(String... args) throws Exception {
+        new ProfileTest().run();
+    }
+
+    public void run() throws Exception {
+        test("A");
+        test("B");
+
+        if (errors > 0)
+            throw new Exception(errors + " occurred");
+    }
+
+    void test(String base) throws IOException {
+        System.err.println("test " + base);
+        File profileDesc = createFiles(base);
+        checkProfile(profileDesc, base);
+    }
+
+    void checkProfile(File profileDesc, String base) throws IOException {
+        Profiles p = Profiles.read(profileDesc);
+        for (int i = 0; i < p.getProfileCount(); i++) {
+            System.err.println(p.getPackages(i));
+            for (String pkg: p.getPackages(i)) {
+                if (!pkg.endsWith(base))
+                    error("unexpected package " + pkg + " for profile " + i);
+            }
+        }
+    }
+
+    File createFiles(String base) throws IOException {
+        File baseDir = new File(base);
+        baseDir.mkdirs();
+        for (int p = 1; p <= 4; p++) {
+            String pkg = "pkg" + p + base;
+            File pkgDir = new File(baseDir, pkg);
+            pkgDir.mkdirs();
+            File clssFile = new File(pkgDir, pkg + "Class.java");
+            try (PrintWriter out = new PrintWriter(new FileWriter(clssFile))) {
+                out.println("package " + pkgDir.getName() + ";");
+                out.println("class " + clssFile.getName().replace(".java", ""));
+            }
+        }
+
+        File profileDesc = new File(baseDir, "profiles" + base + ".txt");
+        try (PrintWriter out = new PrintWriter(new FileWriter(profileDesc))) {
+            for (int p = 1; p <= 4; p++) {
+                String pkg = "pkg" + p + base;
+                createPackage(baseDir, pkg, "Pkg" + p + base + "Class");
+                out.println("PROFILE_" + p + "_RTJAR_INCLUDE_PACKAGES := " + pkg);
+                out.println("PROFILE_" + p + "_RTJAR_INCLUDE_TYPES :=");
+                out.println("PROFILE_" + p + "_RTJAR_EXCLUDE_TYPES :=");
+                out.println("PROFILE_" + p + "_INCLUDE_METAINF_SERVICES := ");
+            }
+        }
+
+        return profileDesc;
+    }
+
+    void createPackage(File baseDir, String pkg, String... classNames) throws IOException {
+        File pkgDir = new File(baseDir, pkg);
+        pkgDir.mkdirs();
+        for (String className: classNames) {
+            File clssFile = new File(pkgDir, className + ".java");
+            try (PrintWriter out = new PrintWriter(new FileWriter(clssFile))) {
+                out.println("package " + pkg + ";");
+                out.println("public class " + className + " { }");
+            }
+        }
+    }
+
+    void error(String msg) {
+        System.err.println("Error: " + msg);
+        errors++;
+    }
+
+    int errors;
+}