From ca669ae54f86dbeea277280690584d9f591c7571 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 18 Feb 2015 07:26:26 +0000
Subject: [PATCH] AutoRefactor: collapse if statements

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
index ca91dfc..d3d2623 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -126,12 +127,9 @@
    */
   public String getBase64()
   {
-    if (base64 == null)
+    if (base64 == null && bytes != null)
     {
-      if (bytes != null)
-      {
-        base64 = Base64.encode(bytes);
-      }
+      base64 = Base64.encode(bytes);
     }
     return base64;
   }
@@ -144,12 +142,9 @@
    */
   public byte[] getBytes() throws ParseException
   {
-    if (bytes == null)
+    if (bytes == null && base64 != null)
     {
-      if (base64 != null)
-      {
-        bytes = Base64.decode(base64);
-      }
+      bytes = Base64.decode(base64);
     }
     return bytes;
   }

--
Gitblit v1.10.0