Merge pull request Netflix#1232 from mebigfatguy/master

compare enums with ==, avoid chances of NPE
rwilliams-r7 · Jun 6, 2016 · ff552f9 · ff552f9
2 parents 6fc37dc + 01084cb
commit ff552f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...main/java/com/netflix/hystrix/contrib/requests/stream/HystrixRequestEventsJsonStream.java b/...main/java/com/netflix/hystrix/contrib/requests/stream/HystrixRequestEventsJsonStream.java
@@ -75,7 +75,7 @@ private static void convertExecutionToJson(JsonGenerator json, HystrixRequestEve
         json.writeArrayFieldStart("events");
         ExecutionResult.EventCounts eventCounts = executionSignature.getEventCounts();
         for (HystrixEventType eventType: HystrixEventType.values()) {
-            if (!eventType.equals(HystrixEventType.COLLAPSED)) {
+            if (eventType != HystrixEventType.COLLAPSED) {
                 if (eventCounts.contains(eventType)) {
                     int eventCount = eventCounts.getCount(eventType);
                     if (eventCount > 1) {

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
@@ -609,7 +609,7 @@ public void call(Notification<? super R> rNotification) {
     }
 
     private Observable<R> executeCommandWithSpecifiedIsolation(final AbstractCommand<R> _cmd) {
-        if (properties.executionIsolationStrategy().get().equals(ExecutionIsolationStrategy.THREAD)) {
+        if (properties.executionIsolationStrategy().get() == ExecutionIsolationStrategy.THREAD) {
             // mark that we are executing in a thread (even if we end up being rejected we still were a THREAD execution and not SEMAPHORE)
             return Observable.defer(new Func0<Observable<R>>() {
                 @Override
@@ -674,7 +674,7 @@ public void call() {
             }).subscribeOn(threadPool.getScheduler(new Func0<Boolean>() {
                 @Override
                 public Boolean call() {
-                    return properties.executionIsolationThreadInterruptOnTimeout().get() && _cmd.isCommandTimedOut.get().equals(TimedOutStatus.TIMED_OUT);
+                    return properties.executionIsolationThreadInterruptOnTimeout().get() && _cmd.isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT;
                 }
             }));
         } else {
@@ -1209,7 +1209,7 @@ protected TryableSemaphore getFallbackSemaphore() {
      * @return TryableSemaphore
      */
     protected TryableSemaphore getExecutionSemaphore() {
-        if (properties.executionIsolationStrategy().get().equals(ExecutionIsolationStrategy.SEMAPHORE)) {
+        if (properties.executionIsolationStrategy().get() == ExecutionIsolationStrategy.SEMAPHORE) {
             if (executionSemaphoreOverride == null) {
                 TryableSemaphore _s = executionSemaphorePerCircuit.get(commandKey.name());
                 if (_s == null) {
@@ -1719,7 +1719,7 @@ public boolean isCircuitBreakerOpen() {
      * @return boolean
      */
     public boolean isExecutionComplete() {
-        return commandState.get().equals(CommandState.TERMINAL);
+        return commandState.get() == CommandState.TERMINAL;
     }
 
     /**

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/metric/HystrixCommandExecutionStarted.java b/hystrix-core/src/main/java/com/netflix/hystrix/metric/HystrixCommandExecutionStarted.java
@@ -41,7 +41,7 @@ public boolean isExecutionStart() {
 
     @Override
     public boolean isExecutedInThread() {
-        return isolationStrategy.equals(HystrixCommandProperties.ExecutionIsolationStrategy.THREAD);
+        return isolationStrategy == HystrixCommandProperties.ExecutionIsolationStrategy.THREAD;
     }
 
     @Override