IO reactor status equality clean ups. (#183)
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractSingleCoreIOReactor.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractSingleCoreIOReactor.java
index e58bada..86f32cc 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractSingleCoreIOReactor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractSingleCoreIOReactor.java
@@ -151,7 +151,7 @@
}
} else {
final IOReactorStatus previousStatus = this.status.getAndSet(IOReactorStatus.SHUT_DOWN);
- if (previousStatus.compareTo(IOReactorStatus.ACTIVE) == 0) {
+ if (previousStatus == IOReactorStatus.ACTIVE) {
this.selector.wakeup();
}
synchronized (this.shutdownMutex) {
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
index dea3bfa..f986030 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreIOReactor.java
@@ -119,7 +119,7 @@
}
closePendingChannels();
}
- if (getStatus().compareTo(IOReactorStatus.SHUT_DOWN) == 0) {
+ if (getStatus() == IOReactorStatus.SHUT_DOWN) {
break;
}
@@ -134,16 +134,16 @@
processClosedSessions();
// If active process new channels
- if (getStatus().compareTo(IOReactorStatus.ACTIVE) == 0) {
+ if (getStatus() == IOReactorStatus.ACTIVE) {
processPendingChannels();
processPendingConnectionRequests();
}
// Exit select loop if graceful shutdown has been completed
- if (getStatus().compareTo(IOReactorStatus.SHUTTING_DOWN) == 0 && this.selector.keys().isEmpty()) {
+ if (getStatus() == IOReactorStatus.SHUTTING_DOWN && this.selector.keys().isEmpty()) {
break;
}
- if (getStatus().compareTo(IOReactorStatus.SHUT_DOWN) == 0) {
+ if (getStatus() == IOReactorStatus.SHUT_DOWN) {
break;
}
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreListeningIOReactor.java b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreListeningIOReactor.java
index 18e7029..dff280a 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreListeningIOReactor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/reactor/SingleCoreListeningIOReactor.java
@@ -83,13 +83,13 @@
@Override
protected final void doExecute() throws IOException {
while (!Thread.currentThread().isInterrupted()) {
- if (getStatus().compareTo(IOReactorStatus.ACTIVE) != 0) {
+ if (getStatus() != IOReactorStatus.ACTIVE) {
break;
}
final int readyCount = this.selector.select(this.selectTimeoutMillis);
- if (getStatus().compareTo(IOReactorStatus.ACTIVE) != 0) {
+ if (getStatus() != IOReactorStatus.ACTIVE) {
break;
}