From 7e1e7f9cfbfdb75dd403bbd2f244830a24c176e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pap=20L=C5=91rinc?= <paplorinc@yahoo.com>
Date: Thu, 14 Apr 2016 20:00:52 +0300
Subject: [PATCH] Fixed `Option.when` in case of a nullable supplier

---
 javaslang/src/main/java/javaslang/control/Option.java     | 2 +-
 javaslang/src/test/java/javaslang/control/OptionTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/javaslang/src/main/java/javaslang/control/Option.java b/javaslang/src/main/java/javaslang/control/Option.java
index f7ee6c249a..933cddea16 100644
--- a/javaslang/src/main/java/javaslang/control/Option.java
+++ b/javaslang/src/main/java/javaslang/control/Option.java
@@ -134,7 +134,7 @@ static <T> Option<T> narrow(Option<? extends T> option) {
      */
     static <T> Option<T> when(boolean condition, Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return condition ? of(supplier.get()) : none();
+        return condition ? some(supplier.get()) : none();
     }
 
     /**
diff --git a/javaslang/src/test/java/javaslang/control/OptionTest.java b/javaslang/src/test/java/javaslang/control/OptionTest.java
index 4ce90a8037..8dea4327e5 100644
--- a/javaslang/src/test/java/javaslang/control/OptionTest.java
+++ b/javaslang/src/test/java/javaslang/control/OptionTest.java
@@ -71,7 +71,7 @@ public void shouldCreateNothing() {
 
     @Test
     public void shouldWrapIfTrue() {
-        assertThat(Option.of(null)).isEqualTo(Option.when(true, () -> null));
+        assertThat(Option.some(null)).isEqualTo(Option.when(true, () -> null));
     }
 
     @Test