From b01ecd72d26a45ff4b498881446f5e62237c64be Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Wed, 18 Nov 2020 20:37:35 +0100
Subject: Non-functional-changes-only

---
 .../jdisc/messagebus/MbusClientProvider.java       |  1 +
 .../container/jdisc/messagebus/SessionCache.java   | 23 +++++++---------------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'container-messagebus/src')

diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java
index b90f96fb240..2b86d83547e 100644
--- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java
+++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java
@@ -61,4 +61,5 @@ public class MbusClientProvider implements Provider<MbusClient> {
     public void deconstruct() {
         client.release();
     }
+
 }
diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
index e62f6a8a21a..68b1f5aa5db 100644
--- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
+++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
@@ -159,7 +159,7 @@ public final class SessionCache extends AbstractComponent {
         return sourcesCreator.retain(sourceLock, sources, p);
     }
 
-    private abstract class SessionCreator<PARAMS, KEY, SESSION extends SharedResource> {
+    private abstract static class SessionCreator<PARAMS, KEY, SESSION extends SharedResource> {
 
         abstract SESSION create(PARAMS p);
 
@@ -352,6 +352,7 @@ public final class SessionCache extends AbstractComponent {
     }
 
     static class UnknownThrottlePolicySignature extends ThrottlePolicySignature {
+
         private final ThrottlePolicy policy;
 
         UnknownThrottlePolicySignature(final ThrottlePolicy policy) {
@@ -409,26 +410,16 @@ public final class SessionCache extends AbstractComponent {
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
+            if (this == obj) return true;
+            if (obj == null) return false;
+            if (getClass() != obj.getClass()) return false;
             SourceSessionKey other = (SourceSessionKey) obj;
             if (policy == null) {
-                if (other.policy != null) {
-                    return false;
-                }
+                if (other.policy != null) return false;
             } else if (!policy.equals(other.policy)) {
                 return false;
             }
-            if (Double.doubleToLongBits(timeout) != Double.doubleToLongBits(other.timeout)) {
-                return false;
-            }
+            if (Double.doubleToLongBits(timeout) != Double.doubleToLongBits(other.timeout)) return false;
             return true;
         }
     }
-- 
cgit v1.2.3