DrJavaAtRice
diff --git a/‎drjava/lib/platform.jar‎
36 Bytes b/‎drjava/lib/platform.jar‎
36 Bytes
diff --git a/‎platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler$1.class‎
0 Bytes b/‎platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler$1.class‎
0 Bytes
diff --git a/‎platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.class‎
52 Bytes b/‎platform/classes/base-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.class‎
52 Bytes
diff --git a/‎platform/src-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.java‎
Lines changed: 6 additions & 2 deletions b/‎platform/src-jdk7/edu/rice/cs/drjava/model/compiler/Javac170Compiler.java‎
Lines changed: 6 additions & 2 deletions
@@ -66,6 +66,7 @@
  *  @version $Id$
  */
 public class Javac170Compiler extends JavacCompiler { // Javac170FilteringCompiler {
+  
   public Javac170Compiler(JavaVersion.FullVersion version, String location, List<? extends File> defaultBootClassPath) {
     super(version, location, defaultBootClassPath);
   }
@@ -81,12 +82,15 @@ public boolean isAvailable() {
       // javax.tools.Diagnostic and javax.lang.model.SourceVersion are also found in rt.jar;
       // to test if tools.jar is available, we need to test for a class only found in tools.jar
       Class.forName("com.sun.tools.javac.main.JavaCompiler");
-      return true;
+      
+      // Make sure the compiler returned is not null; this can happen if we have the JRE's library, not the JDK's.
+      JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+      
+      return (compiler != null);
     }
     catch (Exception e) { return false; }
     catch (LinkageError e) { return false; }
   }
-  
 
   /** Compile the given files.
     *  @param files  Source files to compile.