From 348dcbce3b07a9d26f0befd67d28fbf301090e05 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Wed, 29 Apr 2015 16:50:29 +0000
Subject: [PATCH] Minor code cleanup

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
index 4cd3f05..d00e069 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/State.java
@@ -88,7 +88,7 @@
     super(name);
   }
 
-  private ByteString keyForIndex(TreeName indexTreeName) throws StorageRuntimeException
+  private static ByteString keyForIndex(TreeName indexTreeName) throws StorageRuntimeException
   {
     return ByteString.wrap(StaticUtils.getBytes(indexTreeName.toString()));
   }
@@ -135,24 +135,23 @@
     });
   }
 
-  private EnumSet<IndexFlag> decodeFlagsOrGetDefault(ByteSequence sequence) {
+  private static EnumSet<IndexFlag> decodeFlagsOrGetDefault(ByteSequence sequence) {
     if ( sequence == null ) {
       return EnumSet.copyOf(DEFAULT_FLAGS);
-    } else {
-      final EnumSet<IndexFlag> indexState = EnumSet.noneOf(IndexFlag.class);
-      final byte indexValue = sequence.byteAt(0);
-      for (IndexFlag state : IndexFlag.ALL_FLAGS)
-      {
-        if ((indexValue & state.mask) == state.mask)
-        {
-          indexState.add(state);
-        }
-      }
-      return indexState;
     }
+    final EnumSet<IndexFlag> indexState = EnumSet.noneOf(IndexFlag.class);
+    final byte indexValue = sequence.byteAt(0);
+    for (IndexFlag state : IndexFlag.ALL_FLAGS)
+    {
+      if ((indexValue & state.mask) == state.mask)
+      {
+        indexState.add(state);
+      }
+    }
+    return indexState;
   }
 
-  private ByteString encodeFlags(EnumSet<IndexFlag> flags) {
+  private static ByteString encodeFlags(EnumSet<IndexFlag> flags) {
     byte value = 0;
     for(IndexFlag flag : flags) {
       value |= flag.mask;

--
Gitblit v1.10.0