1 files changed, 22 insertions, 11 deletions

diff --git a/src/core/lombok/Lombok.java b/src/core/lombok/Lombok.java
index 07fd083d..d86b6d1c 100644
--- a/src/core/lombok/Lombok.java
+++ b/src/core/lombok/Lombok.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 The Project Lombok Authors.
+ * Copyright (C) 2009-2017 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,6 @@ public class Lombok {
 	 * The exception is still thrown - javac will just stop whining about it.
 	 * <p>
 	 * Example usage:
-	 * <p>
 	 * <pre>public void run() {
 	 *     throw sneakyThrow(new IOException("You don't need to catch me!"));
 	 * }</pre>
@@ -49,26 +48,38 @@ public class Lombok {
 	 */
 	public static RuntimeException sneakyThrow(Throwable t) {
 		if (t == null) throw new NullPointerException("t");
-		Lombok.<RuntimeException>sneakyThrow0(t);
-		return null;
+		return Lombok.<RuntimeException>sneakyThrow0(t);
 	}
 	
 	@SuppressWarnings("unchecked")
-	private static <T extends Throwable> void sneakyThrow0(Throwable t) throws T {
+	private static <T extends Throwable> T sneakyThrow0(Throwable t) throws T {
 		throw (T)t;
 	}
 	
 	/**
-	 * Returns the parameter directly. <br />
+	 * Returns the parameter directly.
 	 * 
-	 * This method can be used to prevent a static analyzer to determine
-	 * the nullness of the passed parameter.
+	 * This method can be used to prevent a static analyzer to determine the nullness of the passed parameter.
 	 * 
-	 * @param <T> the type of the parameter
-	 * @param value the value to return
-	 * @return value
+	 * @param <T> the type of the parameter.
+	 * @param value the value to return.
+	 * @return value (this method just returns the parameter).
 	 */
 	public static <T> T preventNullAnalysis(T value) {
 		return value;
 	}
+	
+	/**
+	 * Ensures that the {@code value} is not {@code null}.
+	 * 
+	 * @param <T> Type of the parameter.
+	 * @param value the value to test for null.
+	 * @param message the message of the {@link NullPointerException}.
+	 * @return the value if it is not null.
+	 * @throws NullPointerException with the {@code message} if the value is null.
+	 */
+	public static <T> T checkNotNull(T value, String message) {
+		if (value == null) throw new NullPointerException(message);
+		return value;
+	}
 }