--- a/langtools/src/share/classes/com/sun/tools/sjavac/Main.java	Fri Aug 08 20:47:24 2014 +0200
+++ b/langtools/src/share/classes/com/sun/tools/sjavac/Main.java	Fri Aug 08 21:26:23 2014 +0200
@@ -205,6 +205,9 @@
         if (!createIfMissing(options.getDestDir()))
             return -1;
 
+        if (!createIfMissing(options.getStateDir()))
+            return -1;
+
         Path gensrc = options.getGenSrcDir();
         if (gensrc != null && !createIfMissing(gensrc))
             return -1;
@@ -345,7 +348,7 @@
                 // Currently sjavac always connects to a server through a socket
                 // regardless if sjavac runs as a background service or not.
                 // This will most likely change in the future.
-                JavacService javacService = new JavacServiceClient(options.getServerConf());
+                JavacService javacService = new JavacServiceClient(options);
                 again = javac_state.performJavaCompilations(javacService, options, recently_compiled, rc);
                 if (!rc[0]) break;
             } while (again);