| commit | 9dcbdd90277b444752a4903af0619648f30fc0ba | [log] [tgz] |
|---|---|---|
| author | Gary Gregory <garydgregory@gmail.com> | Sat Nov 21 12:43:24 2020 -0500 |
| committer | Gary Gregory <garydgregory@gmail.com> | Sat Nov 21 12:43:24 2020 -0500 |
| tree | 4ccfdbba4361f334bb2db03a675fc2cfa0fb1a2a | |
| parent | 84e7daf03afb0691a3d8d20ab945ad68be012345 [diff] |
Use blocks.
diff --git a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/DiskTestObject.java b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/DiskTestObject.java index a2cb415..ed0fa34 100644 --- a/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/DiskTestObject.java +++ b/commons-jcs-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/DiskTestObject.java
@@ -59,9 +59,11 @@ if (other instanceof DiskTestObject) { final DiskTestObject o = (DiskTestObject) other; - if (id != null) + if (id != null) { return id.equals(o.id) && Arrays.equals(imageBytes, o.imageBytes); - else if (id == null && o.id == null) return Arrays.equals(imageBytes, o.imageBytes); + } else if (id == null && o.id == null) { + return Arrays.equals(imageBytes, o.imageBytes); + } } return false; }
diff --git a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java index 3b4acde..5bc04bc 100644 --- a/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java +++ b/commons-jcs-jcache/src/main/java/org/apache/commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java
@@ -47,10 +47,12 @@ @Override public boolean equals(final Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } final Key key = Key.class.cast(o); return !(domain != null ? !domain.equals(key.domain) : key.domain != null)