Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Auge2016-02-02 20:57:50 +0000
committerRaymond Auge2016-02-02 20:57:50 +0000
commit609f393435ae36521fbe514e52ffa6b96b2bc7f8 (patch)
tree1ca5411a937ac92f893334c396fc032a61c9c1b4 /bundles/org.eclipse.equinox.http.servlet
parentf2db13a066d8bbf5a204b6f661966bbe4af411e1 (diff)
downloadrt.equinox.bundles-609f393435ae36521fbe514e52ffa6b96b2bc7f8.tar.gz
rt.equinox.bundles-609f393435ae36521fbe514e52ffa6b96b2bc7f8.tar.xz
rt.equinox.bundles-609f393435ae36521fbe514e52ffa6b96b2bc7f8.zip
Bug 486412 - [http whiteboard] fix wrong boolean operator, simplifyI20160209-0800
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.http.servlet')
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java
index 229eebd18..9eb656646 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ServletContextAdaptor.java
@@ -101,11 +101,11 @@ public class ServletContextAdaptor {
}
public boolean equals (Object obj) {
- if (obj == null) {
+ if (!(obj instanceof ServletContext)) {
return false;
}
- if (!(obj instanceof ServletContext) && !(Proxy.isProxyClass(obj.getClass()))) {
+ if (!(Proxy.isProxyClass(obj.getClass()))) {
return false;
}

Back to the top