From c5d760b2a000ed68f9ae35d66c6d679b1ca777e9 Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <ivan@selidor.net>
Date: Fri, 8 Apr 2016 09:19:24 +0200
Subject: [PATCH] Replace manual checks with equivalent
 ``Optional.ofNullable()``

---
 network/src/main/java/io/bitsquare/p2p/P2PService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/network/src/main/java/io/bitsquare/p2p/P2PService.java b/network/src/main/java/io/bitsquare/p2p/P2PService.java
index ec70e7de18..48268effeb 100644
--- a/network/src/main/java/io/bitsquare/p2p/P2PService.java
+++ b/network/src/main/java/io/bitsquare/p2p/P2PService.java
@@ -109,8 +109,8 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
         this.torDir = torDir;
         this.clock = clock;
 
-        optionalEncryptionService = encryptionService == null ? Optional.empty() : Optional.of(encryptionService);
-        optionalKeyRing = keyRing == null ? Optional.empty() : Optional.of(keyRing);
+        optionalEncryptionService = Optional.ofNullable(encryptionService);
+        optionalKeyRing = Optional.ofNullable(keyRing);
 
         init(useLocalhost, networkId, storageDir);
     }