--- old/src/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java	2014-08-09 00:28:48.615831996 +0200
+++ new/src/share/classes/com/sun/tools/sjavac/comp/JavacServiceImpl.java	2014-08-09 00:28:48.491835595 +0200
@@ -105,7 +105,9 @@
         for (String s : args) {
             options.append(">").append(s).append("< ");
         }
-        javacServer.log(protocolId+" <"+invocationId+"> options "+options.toString());
+        if (javacServer != null) {
+            javacServer.log(protocolId+" <"+invocationId+"> options "+options.toString());
+        }
 
         forcedExit.set(false);
         // Create a new logger.
@@ -120,7 +122,6 @@
                 smartFileManager.cleanArtifacts();
                 smartFileManager.setLog(stdout);
 
-
                 // Do the compilation!
                 CompilationTask task = compiler.getTask(stderr, smartFileManager, null, Arrays.asList(args), null, compilationUnits, context);
                 rc = ((JavacTaskImpl) task).doCall();
@@ -134,8 +135,9 @@
         compilationResult.packageArtifacts = smartFileManager.getPackageArtifacts();
 
         Dependencies deps = Dependencies.instance(context);
-        compilationResult.packageDependencies = deps.getDependencies();
-        compilationResult.packagePubapis = deps.getPubapis();
+        compilationResult.packageDependencies = deps.getSourcefileDependencies();
+        compilationResult.classpathPackageDependencies = deps.getClasspathDependencies();
+        compilationResult.packagePublicApis = deps.getPublicApis();
 
         compilationResult.stdout = stdoutLog.toString();
         compilationResult.stderr = stderrLog.toString();