Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix string comparisons #10204

Closed
wants to merge 2 commits into from
Closed

Fix string comparisons #10204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a54f675
Fix string comparitions
slachiewicz Mar 21, 2015
da0cf9f
Fix string comparison
slachiewicz Mar 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/transport/local/LocalTransport.java
View file
Open in desktop
Expand Up @@ -271,7 +271,7 @@ private void handleRequest(StreamInput stream, long requestId, LocalTransport so
final TransportRequest request = handler.newInstance();
request.remoteAddress(sourceTransport.boundAddress.publishAddress());
request.readFrom(stream);
if (handler.executor() == ThreadPool.Names.SAME) {
if (ThreadPool.Names.SAME.equals(handler.executor())) {
//noinspection unchecked
handler.messageReceived(request, transportChannel);
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
View file
Open in desktop
Expand Up @@ -157,7 +157,7 @@ protected void handleResponse(Channel channel, StreamInput buffer, final Transpo
return;
}
try {
if (handler.executor() == ThreadPool.Names.SAME) {
if (ThreadPool.Names.SAME.equals(handler.executor())) {
//noinspection unchecked
handler.handleResponse(response);
} else {
Expand All @@ -184,7 +184,7 @@ private void handleException(final TransportResponseHandler handler, Throwable e
error = new RemoteTransportException(error.getMessage(), error);
}
final RemoteTransportException rtx = (RemoteTransportException) error;
if (handler.executor() == ThreadPool.Names.SAME) {
if (ThreadPool.Names.SAME.equals(handler.executor())) {
try {
handler.handleException(rtx);
} catch (Throwable e) {
Expand Down Expand Up @@ -216,7 +216,7 @@ protected String handleRequest(Channel channel, StreamInput buffer, long request
final TransportRequest request = handler.newInstance();
request.remoteAddress(new InetSocketTransportAddress((InetSocketAddress) channel.getRemoteAddress()));
request.readFrom(buffer);
if (handler.executor() == ThreadPool.Names.SAME) {
if (ThreadPool.Names.SAME.equals(handler.executor())) {
//noinspection unchecked
handler.messageReceived(request, transportChannel);
} else {
Expand Down