diff --git a/src/main/java/org/jboss/msc/service/IdentityHashSet.java b/src/main/java/org/jboss/msc/service/IdentityHashSet.java index 67a8aec3b..f208447d7 100644 --- a/src/main/java/org/jboss/msc/service/IdentityHashSet.java +++ b/src/main/java/org/jboss/msc/service/IdentityHashSet.java @@ -473,7 +473,7 @@ private class IdentityHashSetIterator implements Iterator { Object table[] = IdentityHashSet.this.table; public boolean hasNext() { - if (hasNext == true) + if (hasNext) return true; Object table[] = this.table; diff --git a/src/main/java/org/jboss/msc/service/ServiceControllerImpl.java b/src/main/java/org/jboss/msc/service/ServiceControllerImpl.java index b7be5ae09..aa027912a 100644 --- a/src/main/java/org/jboss/msc/service/ServiceControllerImpl.java +++ b/src/main/java/org/jboss/msc/service/ServiceControllerImpl.java @@ -514,17 +514,17 @@ void transition(final ArrayList tasks) { } case ON_DEMAND: case PASSIVE: { - if (demandedByCount > 0 && dependenciesDemanded == false) { + if (demandedByCount > 0 && !dependenciesDemanded) { tasks.add(new DemandDependenciesTask()); dependenciesDemanded = true; - } else if (demandedByCount == 0 && dependenciesDemanded == true) { + } else if (demandedByCount == 0 && dependenciesDemanded) { tasks.add(new UndemandDependenciesTask()); dependenciesDemanded = false; } break; } case ACTIVE: { - if (dependenciesDemanded == false) { + if (!dependenciesDemanded) { tasks.add(new DemandDependenciesTask()); dependenciesDemanded = true; } @@ -586,7 +586,7 @@ void transition(final ArrayList tasks) { } case UP_to_STOP_REQUESTED: { if (mode == Mode.LAZY && demandedByCount == 0) { - assert dependenciesDemanded == true; + assert dependenciesDemanded; tasks.add(new UndemandDependenciesTask()); dependenciesDemanded = false; }