src/share/classes/com/sun/tools/sjavac/server/CompilerThread.java

*** 329,338 ****
--- 329,339 ----
                      }
  
                      smartFileManager.flush();
                  }
              } catch (Exception e) {
+                         e.printStackTrace(System.err);
                  stderr.println(e.getMessage());
                  forcedExitCode = -1;
              }
  
              // Send the response..
*** 350,376 ****
                      out.println(" "+a.toString());
                  }
              }
              Dependencies deps = Dependencies.instance(context);
              out.println(JavacServer.PROTOCOL_PACKAGE_DEPENDENCIES);
!             Map<String,Set<String>> pd = deps.getDependencies();
              for (String aPkgName : pd.keySet()) {
                  out.println("+"+aPkgName);
                  Set<String> ds = pd.get(aPkgName);
                      // Everything depends on java.lang
                      if (!ds.contains(":java.lang")) ds.add(":java.lang");
                  for (String d : ds) {
                      out.println(" "+d);
                  }
              }
              out.println(JavacServer.PROTOCOL_PACKAGE_PUBLIC_APIS);
!             Map<String,String> pp = deps.getPubapis();
              for (String aPkgName : pp.keySet()) {
                  out.println("+"+aPkgName);
!                 String ps = pp.get(aPkgName);
!                 // getPubapis added a space to each line!
!                 out.println(ps);
                  compiledPkgs.append(aPkgName+" ");
              }
              out.println(JavacServer.PROTOCOL_SYSINFO);
              out.println("num_cores=" + Runtime.getRuntime().availableProcessors());
              out.println("max_memory=" + Runtime.getRuntime().maxMemory());
--- 351,389 ----
                      out.println(" "+a.toString());
                  }
              }
              Dependencies deps = Dependencies.instance(context);
              out.println(JavacServer.PROTOCOL_PACKAGE_DEPENDENCIES);
!             Map<String,Set<String>> pd = deps.getSourcefileDependencies();
!             Map<String,Set<String>> cd = deps.getClasspathDependencies();
! 
              for (String aPkgName : pd.keySet()) {
                  out.println("+"+aPkgName);
                  Set<String> ds = pd.get(aPkgName);
                      // Everything depends on java.lang
                      if (!ds.contains(":java.lang")) ds.add(":java.lang");
                  for (String d : ds) {
                      out.println(" "+d);
                  }
              }
+ 
+             for (String aPkgName : cd.keySet()) {
+                 Set<String> cs = cd.get(aPkgName);
+                 for (String c : cs) {
+                     out.println(" "+c);
+                 }
+             }
+ 
              out.println(JavacServer.PROTOCOL_PACKAGE_PUBLIC_APIS);
!             Map<String,List<String>> pp = deps.getPublicApis();
              for (String aPkgName : pp.keySet()) {
                  out.println("+"+aPkgName);
!                 List<String> ls = pp.get(aPkgName);
!                 for (String s : ls) {
!                     out.print(" ");
!                     out.println(s);
!                 }
                  compiledPkgs.append(aPkgName+" ");
              }
              out.println(JavacServer.PROTOCOL_SYSINFO);
              out.println("num_cores=" + Runtime.getRuntime().availableProcessors());
              out.println("max_memory=" + Runtime.getRuntime().maxMemory());