/hg/icedtea-web: Went through the source of IcedTeaWeb with Find...
adomurad at icedtea.classpath.org
adomurad at icedtea.classpath.org
Thu May 17 11:14:10 PDT 2012
changeset 7151720a2f5b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7151720a2f5b
author: Adam Domurad <adomurad at redhat.com>
date: Thu May 17 14:14:03 2012 -0400
Went through the source of IcedTeaWeb with FindBugs and went over all reported cases of == being used to compare String's. Some usage cases were valid (eg, .equals eventually called, magic String value). I noted one such usage case. The others were changed to .equals calls.
diffstat:
ChangeLog | 14 ++++++++++
netx/net/sourceforge/jnlp/JNLPFile.java | 2 +-
netx/net/sourceforge/jnlp/SecurityDesc.java | 4 +-
netx/net/sourceforge/jnlp/Version.java | 5 ++-
plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 2 +-
plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java | 10 +++---
6 files changed, 26 insertions(+), 11 deletions(-)
diffs (113 lines):
diff -r b9a6491e6715 -r 7151720a2f5b ChangeLog
--- a/ChangeLog Wed May 16 17:01:46 2012 +0200
+++ b/ChangeLog Thu May 17 14:14:03 2012 -0400
@@ -1,3 +1,17 @@
+2012-05-17 Adam Domurad <adomurad at redhat.com>
+
+ Fixed uses of == to compare String objects to .equals where
+ appropriate.
+ Noted a non-obvious use of == to compare a 'magic' String reference.
+ * netx/net/sourceforge/jnlp/JNLPFile.java:
+ Changed calls that compare String contents from == to .equals
+ * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java:
+ Same
+ * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java:
+ Same
+ * netx/net/sourceforge/jnlp/Version.java: Added comment explaining why
+ == was used vs .equals
+
2012-05-14 Jiri Vanek <jvanek at redhat.com>
* tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
diff -r b9a6491e6715 -r 7151720a2f5b netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Wed May 16 17:01:46 2012 +0200
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Thu May 17 14:14:03 2012 -0400
@@ -208,7 +208,7 @@
//(i.e. If the jnlp file being launched exist locally, but it
//originated from a website, then download the one from the website
//into the cache).
- if (sourceLocation != null && location.getProtocol() == "file") {
+ if (sourceLocation != null && "file".equals(location.getProtocol())) {
openURL(sourceLocation, version, policy);
}
diff -r b9a6491e6715 -r 7151720a2f5b netx/net/sourceforge/jnlp/SecurityDesc.java
--- a/netx/net/sourceforge/jnlp/SecurityDesc.java Wed May 16 17:01:46 2012 +0200
+++ b/netx/net/sourceforge/jnlp/SecurityDesc.java Thu May 17 14:14:03 2012 -0400
@@ -202,7 +202,7 @@
PermissionCollection permissions = getSandBoxPermissions();
// discard sandbox, give all
- if (type == ALL_PERMISSIONS) {
+ if (ALL_PERMISSIONS.equals(type)) {
permissions = new Permissions();
if (customTrustedPolicy == null) {
permissions.add(new AllPermission());
@@ -213,7 +213,7 @@
}
// add j2ee to sandbox if needed
- if (type == J2EE_PERMISSIONS)
+ if (J2EE_PERMISSIONS.equals(type))
for (int i = 0; i < j2eePermissions.length; i++)
permissions.add(j2eePermissions[i]);
diff -r b9a6491e6715 -r 7151720a2f5b netx/net/sourceforge/jnlp/Version.java
--- a/netx/net/sourceforge/jnlp/Version.java Wed May 16 17:01:46 2012 +0200
+++ b/netx/net/sourceforge/jnlp/Version.java Thu May 17 14:14:03 2012 -0400
@@ -230,6 +230,7 @@
Integer number2 = Integer.valueOf(0);
// compare as integers
+ // for normalization key, compare exact object, not using .equals
try {
if (!(part1 == emptyString)) // compare to magic normalization key
number1 = Integer.valueOf(part1);
@@ -242,9 +243,9 @@
// means to compare as strings
}
- if (part1 == emptyString)
+ if (part1 == emptyString) // compare to magic normalization key
part1 = "";
- if (part2 == emptyString)
+ if (part2 == emptyString) // compare to magic normalization key
part2 = "";
return part1.compareTo(part2);
diff -r b9a6491e6715 -r 7151720a2f5b plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java
--- a/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java Wed May 16 17:01:46 2012 +0200
+++ b/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java Thu May 17 14:14:03 2012 -0400
@@ -50,7 +50,7 @@
String[] args = message.split(" ");
// FIXME: Is it even possible to distinguish between null and void
// here?
- if (args[3] != "null" && args[3] != "void")
+ if (!"null".equals(args[3]) && !"void".equals(args[3]))
object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[3]));
setDone(true);
}
diff -r b9a6491e6715 -r 7151720a2f5b plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java
--- a/plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java Wed May 16 17:01:46 2012 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java Thu May 17 14:14:03 2012 -0400
@@ -41,15 +41,15 @@
public PluginCallRequest getPluginCallRequest(String id, String message, Long reference) {
- if (id == "member") {
+ if ("member".equals(id)) {
return new GetMemberPluginCallRequest(message, reference);
- } else if (id == "void") {
+ } else if ("void".equals(id)) {
return new VoidPluginCallRequest(message, reference);
- } else if (id == "window") {
+ } else if ("window".equals(id)) {
return new GetWindowPluginCallRequest(message, reference);
- } else if (id == "proxyinfo") {
+ } else if ("proxyinfo".equals(id)) {
return new PluginProxyInfoRequest(message, reference);
- } else if (id == "cookieinfo") {
+ } else if ("cookieinfo".equals(id)) {
return new PluginCookieInfoRequest(message, reference);
} else {
throw new RuntimeException("Unknown plugin call request type requested from factory");
More information about the distro-pkg-dev
mailing list