Last spotbug revert/fixes

Azure · Apr 27, 2019 · 8660233 · 8660233
1 parent de624d2
commit 8660233
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.../main/java/com/microsoft/azure/eventprocessorhost/AzureStorageCheckpointLeaseManager.java b/.../main/java/com/microsoft/azure/eventprocessorhost/AzureStorageCheckpointLeaseManager.java
@@ -332,15 +332,16 @@ public CompletableFuture<List<BaseLease>> getAllLeases() {
                         (bp.getLeaseState() == LeaseState.LEASED)));
             });
             future = CompletableFuture.completedFuture(infos);
-        } catch (Exception e) {
+        } catch (URISyntaxException | StorageException | NoSuchElementException e) {
             Throwable effective = e;
             if (e instanceof NoSuchElementException) {
                 // If there is a StorageException in the forEach, it arrives wrapped in a NoSuchElementException.
                 // Strip the misleading NoSuchElementException to provide a meaningful error for the user.
                 effective = e.getCause();
             }
-            TRACE_LOGGER.warn(this.hostContext.withHost("Failure while getting lease state details"), effective);
-            future = new CompletableFuture<List<BaseLease>>();
+
+            TRACE_LOGGER.warn(this.hostContext.withHost("Failure while getting lease state details"), e);
+            future = new CompletableFuture<>();
             future.completeExceptionally(LoggingUtils.wrapException(effective, EventProcessorHostActionStrings.GETTING_LEASE));
         }
 

diff --git a/...venthubs-eph/src/main/java/com/microsoft/azure/eventprocessorhost/EventProcessorHost.java b/...venthubs-eph/src/main/java/com/microsoft/azure/eventprocessorhost/EventProcessorHost.java
@@ -269,14 +269,13 @@ public EventProcessorHost(
         if (leaseManager == null) {
             throw new IllegalArgumentException("Must provide an object which implements ILeaseManager");
         }
+
         // executorService argument is allowed to be null, that is the indication to use an internal threadpool.
 
-        if (this.partitionManagerOptions == null) {
-            // Normally will not be null because we're using the AzureStorage implementation.
-            // If it is null, we're using user-supplied implementation. Establish generic defaults
-            // in case the user doesn't provide an options object.
-            this.partitionManagerOptions = new PartitionManagerOptions();
-        }
+        // Normally will not be null because we're using the AzureStorage implementation.
+        // If it is null, we're using user-supplied implementation. Establish generic defaults
+        // in case the user doesn't provide an options object.
+        this.partitionManagerOptions = new PartitionManagerOptions();
 
         if (executorService != null) {
             // User has supplied an ExecutorService, so use that.