aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2012-08-10 18:06:24 +0200
committerReinier Zwitserloot <reinier@zwitserloot.com>2012-08-10 18:06:24 +0200
commitb31ca9606b25839701194c5fca71c12c1a165565 (patch)
tree1bf46b043da85051cda48191945044db1865b47b /src
parent1be7da76012b246af24d0515d192bca85d65c823 (diff)
downloadlombok-b31ca9606b25839701194c5fca71c12c1a165565.tar.gz
lombok-b31ca9606b25839701194c5fca71c12c1a165565.tar.bz2
lombok-b31ca9606b25839701194c5fca71c12c1a165565.zip
bugfix: Detecting javac6 didn't work on soylatte; now it does.
Diffstat (limited to 'src')
-rw-r--r--src/core/lombok/javac/apt/LombokFileObjects.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/lombok/javac/apt/LombokFileObjects.java b/src/core/lombok/javac/apt/LombokFileObjects.java
index 304b6a94..412e449b 100644
--- a/src/core/lombok/javac/apt/LombokFileObjects.java
+++ b/src/core/lombok/javac/apt/LombokFileObjects.java
@@ -63,7 +63,7 @@ final class LombokFileObjects {
@Override public Method getDecoderMethod() {
synchronized (decoderIsSet) {
if (decoderIsSet.get()) return decoderMethod;
- decoderMethod = getDecoderMethod("com.sun.tools.javac.util.BaseFileObject");
+ decoderMethod = getDecoderMethod("com.sun.tools.javac.file.BaseFileObject");
decoderIsSet.set(true);
return decoderMethod;
}
@@ -92,6 +92,7 @@ final class LombokFileObjects {
static Compiler getCompiler(JavaFileManager jfm) {
String jfmClassName = jfm != null ? jfm.getClass().getName() : "null";
if (jfmClassName.equals("com.sun.tools.javac.util.DefaultFileManager")) return Compiler.JAVAC6;
+ if (jfmClassName.equals("com.sun.tools.javac.util.JavacFileManager")) return Compiler.JAVAC6;
if (jfmClassName.equals("com.sun.tools.javac.file.JavacFileManager")) return Compiler.JAVAC7;
try {
if (Class.forName("com.sun.tools.javac.file.BaseFileObject") == null) throw new NullPointerException();