From: Robert Varga <rovarga@cisco.com>
Date: Fri, 13 May 2016 08:11:59 +0000 (+0200)
Subject: Address minor sonar issues in ImmutableOffsetMap
X-Git-Tag: release/boron~139
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=11d4611a33d5dfb52b1d6319e76085f0e209aa50;p=yangtools.git

Address minor sonar issues in ImmutableOffsetMap

Reorder keywords and rename a temporary variable.

Change-Id: I41594bb9fa9cb265e80ab86e0a11e0c049b4cda0
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
index 855e8a2aaa..7f923d6bb3 100644
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
@@ -70,17 +70,17 @@ public abstract class ImmutableOffsetMap<K, V> implements UnmodifiableMapPhase<K
 
         @Override
         void setFields(final List<K> keys, final V[] values) throws IOException {
-            final Map<K, Integer> offsets = OffsetMapCache.unorderedOffsets(keys);
+            final Map<K, Integer> newOffsets = OffsetMapCache.unorderedOffsets(keys);
 
-            setField(this, OFFSETS_FIELD, offsets);
-            setField(this, ARRAY_FIELD, OffsetMapCache.adjustedArray(offsets, keys, values));
+            setField(this, OFFSETS_FIELD, newOffsets);
+            setField(this, ARRAY_FIELD, OffsetMapCache.adjustedArray(newOffsets, keys, values));
         }
     }
 
     private static final long serialVersionUID = 1L;
 
-    private transient final Map<K, Integer> offsets;
-    private transient final V[] objects;
+    private final transient Map<K, Integer> offsets;
+    private final transient V[] objects;
     private transient int hashCode;
 
     /**