Calling setCharset with null will use the system default charset (issue 181)

2 files changed, 7 insertions, 3 deletions

diff --git a/doc/changelog.markdown b/doc/changelog.markdown
index 9264adde..cd47f16a 100644
--- a/doc/changelog.markdown
+++ b/doc/changelog.markdown
@@ -1,15 +1,16 @@
 Lombok Changelog
 ----------------
 
-### v0.9.4 "Burning Emu" (edge)
+### v0.10.0 "Burning Emu" (edge)
 * FEATURE: Added support for several logging frameworks by the `@Log` annotation.
 * FEATURE: Lombok now supports post-compile transformers. [Issue #144](http://code.google.com/p/projectlombok/issues/detail?id=144)
 * FEATURE: Using `@SneakyThrows` no longer requires a runtime dependency on lombok.jar. In fact, any call to {@code Lombok.sneakyThrows(ex)} is optimized at the bytecode level and no longer requires you to actually have lombok.jar or lombok-runtime.jar on the classpath.
- * FEATURE: @XArgsConstructor, @Getter, and @ToString can now be used on enum declarations. Previously, behaviour of these annotations on enums was undefined.
+* FEATURE: @XArgsConstructor, @Getter, and @ToString can now be used on enum declarations. Previously, behaviour of these annotations on enums was undefined.
 * BUGFIX: `@Setter` and `@Getter` can now be applied to static fields again (was broken in v0.9.3 only). [Issue #136](http://code.google.com/p/projectlombok/issues/detail?id=136)
 * BUGFIX: delombok added type parameters to constructors that mirror the type's own type parameters. This resulted in delombok turning any generated constructor that takes at least 1 parameter of type 'T' into something that didn't compile, and to boot, a confusing error message ('T is not compatible with T'). This is now fixed. [Issue #140](http://code.google.com/p/projectlombok/issues/detail?id=140)
 * BUGFIX: Add null check for `@Cleanup` [Issue #154](http://code.google.com/p/projectlombok/issues/detail?id=154)
 * BUGFIX: The Eclipse source generator would place the generated code outside the class [Issue #154](http://code.google.com/p/projectlombok/issues/detail?id=155)
+* ENHANCEMENT: Setting the charset for delombok to null will now use the system default charset. [Issue #181](http://code.google.com/p/projectlombok/issues/detail?id=181)
 
 ### v0.9.3 "Burrowing Whale" (July 25th, 2010)
 * FEATURE: Adding `@Getter` or `@Setter` to a class is now legal and is like adding those annotations to every non-static field in it. [Issue #129](http://code.google.com/p/projectlombok/issues/detail?id=129)
diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java
index 7e8220a0..a869f66d 100644
--- a/src/delombok/lombok/delombok/Delombok.java
+++ b/src/delombok/lombok/delombok/Delombok.java
@@ -202,7 +202,10 @@ public class Delombok {
 	}
 	
 	public void setCharset(String charsetName) throws UnsupportedCharsetException {
-		
+		if (charsetName == null) {
+			charset = Charset.defaultCharset();
+			return;
+		}
 		charset = Charset.forName(charsetName);
 	}