From ed8ba7f0edbcd1cbd877f776bb473edae6b0c81f Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Tue, 12 Apr 2016 21:46:08 +0500 Subject: [PATCH] Fixing squid:S1854 - Dead stores should be removed. --- .../java/io/reactivesocket/exceptions/Exceptions.java | 2 +- src/main/java/io/reactivesocket/internal/Requester.java | 4 ++-- src/main/java/io/reactivesocket/internal/Responder.java | 8 ++++---- .../reactivesocket/internal/rx/CompositeDisposable.java | 2 +- .../java/io/reactivesocket/lease/FairLeaseGovernor.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/reactivesocket/exceptions/Exceptions.java b/src/main/java/io/reactivesocket/exceptions/Exceptions.java index 7b2581b80..1ea1042f8 100644 --- a/src/main/java/io/reactivesocket/exceptions/Exceptions.java +++ b/src/main/java/io/reactivesocket/exceptions/Exceptions.java @@ -31,7 +31,7 @@ public static Throwable from(Frame frame) { message = new String(byteBuffer.array(), UTF_8); } - Throwable ex = null; + Throwable ex; switch (errorCode) { case APPLICATION_ERROR: ex = new ApplicationException(message); diff --git a/src/main/java/io/reactivesocket/internal/Requester.java b/src/main/java/io/reactivesocket/internal/Requester.java index 924ffbae8..586fff298 100644 --- a/src/main/java/io/reactivesocket/internal/Requester.java +++ b/src/main/java/io/reactivesocket/internal/Requester.java @@ -947,7 +947,7 @@ public void onNext(Frame frame) { } public void onError(Throwable t) { - Collection> subjects = null; + Collection> subjects; synchronized (Requester.this) { subjects = streamInputMap.values(); } @@ -958,7 +958,7 @@ public void onError(Throwable t) { } public void onComplete() { - Collection> subjects = null; + Collection> subjects; synchronized (Requester.this) { subjects = streamInputMap.values(); } diff --git a/src/main/java/io/reactivesocket/internal/Responder.java b/src/main/java/io/reactivesocket/internal/Responder.java index 57870ea21..1a0895d99 100644 --- a/src/main/java/io/reactivesocket/internal/Responder.java +++ b/src/main/java/io/reactivesocket/internal/Responder.java @@ -253,7 +253,7 @@ public void onNext(Frame requestFrame) { responsePublisher = handleMetadataPush( requestFrame, requestHandler); } else if (requestFrame.getType() == FrameType.CANCEL) { - Subscription s = null; + Subscription s; synchronized (Responder.this) { s = cancellationSubscriptions.get(requestFrame.getStreamId()); } @@ -262,7 +262,7 @@ public void onNext(Frame requestFrame) { } return; } else if (requestFrame.getType() == FrameType.REQUEST_N) { - SubscriptionArbiter inFlightSubscription = null; + SubscriptionArbiter inFlightSubscription; synchronized (Responder.this) { inFlightSubscription = inFlight.get(requestFrame.getStreamId()); } @@ -693,7 +693,7 @@ private Publisher handleRequestChannel(Frame requestFrame, Int2ObjectHashMap cancellationSubscriptions, Int2ObjectHashMap inFlight) { - UnicastSubject channelSubject = null; + UnicastSubject channelSubject; synchronized(Responder.this) { channelSubject = channels.get(requestFrame.getStreamId()); } @@ -869,7 +869,7 @@ public void addTransportRequest(long n) { } private void tryRequest() { - long toRequest = 0; + long toRequest; synchronized(this) { if(applicationProducer == null) { return; diff --git a/src/main/java/io/reactivesocket/internal/rx/CompositeDisposable.java b/src/main/java/io/reactivesocket/internal/rx/CompositeDisposable.java index f8cbf5b1b..f46a65901 100644 --- a/src/main/java/io/reactivesocket/internal/rx/CompositeDisposable.java +++ b/src/main/java/io/reactivesocket/internal/rx/CompositeDisposable.java @@ -47,7 +47,7 @@ public void clear() { @Override public void dispose() { - Disposable[] cs = null; + Disposable[] cs; synchronized (this) { disposed = true; cs = resources.toArray(new Disposable[] {}); diff --git a/src/main/java/io/reactivesocket/lease/FairLeaseGovernor.java b/src/main/java/io/reactivesocket/lease/FairLeaseGovernor.java index 437a81998..05eb37c84 100644 --- a/src/main/java/io/reactivesocket/lease/FairLeaseGovernor.java +++ b/src/main/java/io/reactivesocket/lease/FairLeaseGovernor.java @@ -68,7 +68,7 @@ public synchronized void unregister(Responder responder) { @Override public synchronized boolean accept(Responder responder, Frame frame) { - boolean valid = false; + boolean valid; final Integer remainingTickets = responders.get(responder); return remainingTickets == null || remainingTickets > 0; }