src/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java

@@ -30,10 +30,11 @@
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Random;
 import java.util.Set;
+import java.util.List;
 import java.util.Map;
 
 import com.sun.tools.sjavac.options.Options;
 import com.sun.tools.sjavac.server.CompilationResult;
 import com.sun.tools.sjavac.server.JavacService;

@@ -73,11 +74,12 @@
                              final Map<URI,Set<String>> visibleClasses,
                              Map<String,Set<String>> oldPackageDependents,
                              URI destRoot,
                              final Map<String,Set<URI>>    packageArtifacts,
                              final Map<String,Set<String>> packageDependencies,
-                             final Map<String,String>      packagePubapis,
+                             final Map<String,List<String>> packagePublicApis,
+                             final Map<String,Set<String>> classpathPackageDependencies,
                              int debugLevel,
                              boolean incremental,
                              int numCores,
                              final PrintStream out,
                              final PrintStream err)

@@ -91,11 +93,11 @@
         String psServerSettings = Util.cleanSubOptions(Util.set("portfile","sjavac","background","keepalive"), javacService.serverSettings());
 
         // Get maximum heap size from the server!
         SysInfo sysinfo = javacService.getSysInfo();
         if (sysinfo.numCores == -1) {
-            Log.error("Could not query server for sysinfo!");
+            Log.error("Could not query server for sysinfo! Check javac_server.stdouterr for exceptions");
             return false;
         }
         int numMBytes = (int)(sysinfo.maxMemory / ((long)(1024*1024)));
         Log.debug("Server reports "+numMBytes+"MiB of memory and "+sysinfo.numCores+" cores");
 

@@ -222,11 +224,12 @@
                                                   Collections.<File>emptyList(),
                                                   cc.srcs,
                                                   visibleSources);
                     packageArtifacts.putAll(rn[ii].packageArtifacts);
                     packageDependencies.putAll(rn[ii].packageDependencies);
-                    packagePubapis.putAll(rn[ii].packagePubapis);
+                    packagePublicApis.putAll(rn[ii].packagePublicApis);
+                    classpathPackageDependencies.putAll(rn[ii].classpathPackageDependencies);
                 }
             };
 
             if (cc.srcs.size() > 0) {
                 String numdeps = "";