This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new e207bb8 Switching to use String equals in a few places
e207bb8 is described below
commit e207bb8052efb93848150a4b31f4747551a0283d
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Oct 15 13:08:20 2019 +0100
Switching to use String equals in a few places
---
.../apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java | 2 +-
.../org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java | 2 +-
.../cxf/rs/security/oauth/services/AuthorizationRequestHandler.java | 2 +-
.../org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java | 2 +-
.../jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
index eab3175..604e32c 100644
---
a/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
+++
b/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
@@ -343,7 +343,7 @@ public class CrossOriginResourceSharingFilter implements
ContainerRequestFilter,
Message m = JAXRSUtils.getCurrentMessage();
String op =
(String)m.getExchange().get(CrossOriginResourceSharingFilter.class.getName());
- if (op == null || op == PREFLIGHT_FAILED) {
+ if (op == null || PREFLIGHT_FAILED.equals(op)) {
return;
}
if (responseContext.getStatus() ==
Response.Status.UNAUTHORIZED.getStatusCode()
diff --git
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
index 02e0b57..f792fc4 100644
---
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
+++
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
@@ -100,7 +100,7 @@ public class AccessTokenHandler {
LOG.log(Level.WARNING, "An OAuth-related problem: {0}", new
Object[] {e.fillInStackTrace()});
int code = e.getHttpStatusCode();
if (code == HttpServletResponse.SC_OK) {
- code = e.getProblem() == OAuth.Problems.CONSUMER_KEY_UNKNOWN
+ code =
OAuth.Problems.CONSUMER_KEY_UNKNOWN.equals(e.getProblem())
? 401 : 400;
}
return OAuthUtils.handleException(mc, e, code);
diff --git
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
index 955b1a9..156d4fd 100644
---
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
+++
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
@@ -158,7 +158,7 @@ public class AuthorizationRequestHandler {
LOG.log(Level.WARNING, "An OAuth related problem: {0}", new
Object[]{e.fillInStackTrace()});
int code = e.getHttpStatusCode();
if (code == HttpServletResponse.SC_OK) {
- code = e.getProblem() == OAuth.Problems.CONSUMER_KEY_UNKNOWN
+ code =
OAuth.Problems.CONSUMER_KEY_UNKNOWN.equals(e.getProblem())
? 401 : 400;
}
return OAuthUtils.handleException(mc, e, code);
diff --git
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
index 8cd1c68..fdfc4ad 100644
---
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
+++
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
@@ -107,7 +107,7 @@ public class RequestTokenHandler {
LOG.log(Level.WARNING, "An OAuth-related problem: {0}", new
Object[] {e.fillInStackTrace()});
int code = e.getHttpStatusCode();
if (code == HttpServletResponse.SC_OK) {
- code = e.getProblem() == OAuth.Problems.CONSUMER_KEY_UNKNOWN
+ code =
OAuth.Problems.CONSUMER_KEY_UNKNOWN.equals(e.getProblem())
? 401 : 400;
}
return OAuthUtils.handleException(mc, e, code);
diff --git
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index 6ca3567..eaf810b 100644
---
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -207,7 +207,7 @@ public class JMSEndpoint {
public String getRequestURI() {
StringBuilder requestUri = new StringBuilder("jms:");
- if (jmsVariant == JNDI_TOPIC) {
+ if (JNDI_TOPIC.equals(jmsVariant)) {
requestUri.append("jndi");
} else {
requestUri.append(jmsVariant);
