svn commit: r1774213 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: file/GCJournal.java standby/store/CommunicationObserver.java

[mduerig]

Author: mduerig
Date: Wed Dec 14 13:19:00 2016
New Revision: 1774213

URL: http://svn.apache.org/viewvc?rev=1774213&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Add braces to if/else statement

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java?rev=1774213&r1=1774212&r2=1774213&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/GCJournal.java
 Wed Dec 14 13:19:00 2016
@@ -228,23 +228,31 @@ public class GCJournal {
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj)
+            if (this == obj) {
                 return true;
-            if (obj == null)
+            }
+            if (obj == null) {
                 return false;
-            if (getClass() != obj.getClass())
+            }
+            if (getClass() != obj.getClass()) {
                 return false;
+            }
             GCJournalEntry other = (GCJournalEntry) obj;
-            if (gcGeneration != other.gcGeneration)
+            if (gcGeneration != other.gcGeneration) {
                 return false;
-            if (nodes != other.nodes)
+            }
+            if (nodes != other.nodes) {
                 return false;
-            if (reclaimedSize != other.reclaimedSize)
+            }
+            if (reclaimedSize != other.reclaimedSize) {
                 return false;
-            if (repoSize != other.repoSize)
+            }
+            if (repoSize != other.repoSize) {
                 return false;
-            if (ts != other.ts)
+            }
+            if (ts != other.ts) {
                 return false;
+            }
             return true;
         }
     }

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java?rev=1774213&r1=1774212&r2=1774213&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/CommunicationObserver.java
 Wed Dec 14 13:19:00 2016
@@ -182,7 +182,9 @@ public class CommunicationObserver {
     private void cleanUp() {
         while (this.partnerDetails.size() >= MAX_CLIENT_STATISTICS) {
             CommunicationPartnerMBean oldestEntry = oldestEntry();
-            if (oldestEntry == null) return;
+            if (oldestEntry == null) {
+                return;
+            }
             log.info("housekeeping: removing statistics for " + 
oldestEntry.getName());
             unregister(oldestEntry);
             this.partnerDetails.remove(oldestEntry.getName());
@@ -192,7 +194,9 @@ public class CommunicationObserver {
     private CommunicationPartnerMBean oldestEntry() {
         CommunicationPartnerMBean ret = null;
         for (CommunicationPartnerMBean m : this.partnerDetails.values()) {
-            if (ret == null || ret.lastSeen.after(m.lastSeen)) ret = m;
+            if (ret == null || ret.lastSeen.after(m.lastSeen)) {
+                ret = m;
+            }
         }
         return ret;
     }