This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 034ed247a6 Fixed: String comparison (OFBIZ-13320) #926
034ed247a6 is described below
commit 034ed247a663c5bac527041352c756e9f26f7e40
Author: Dmitry Kryukov <[email protected]>
AuthorDate: Sat Nov 29 17:32:51 2025 +0300
Fixed: String comparison (OFBIZ-13320) #926
In several locations strings are compared with == and !=
Should be compared with equals, unless they are interned. But even for
interned strings equals() is safe
Thanks: Dmitriy Kryukov
---------
Signed-off-by: Dmitry Kryukov <[email protected]>
---
.../org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java | 4 ++--
.../java/org/apache/ofbiz/catalina/container/CatalinaContainer.java | 3 ++-
.../src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java | 2 +-
.../main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java | 2 +-
.../widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
index b143ddf042..27c3ac24ec 100644
---
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
+++
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
@@ -185,7 +185,7 @@ public class GatewayResponse {
Node rootnode = doc.getDocumentElement();
String root = rootnode.getNodeName();
- if ("ewayResponse" != root) {
+ if (!"ewayResponse".equals(root)) {
throw new Exception("Bad root element in response: " + root);
}
@@ -195,7 +195,7 @@ public class GatewayResponse {
for (int i = 0; i < length; i++) {
Node node = list.item(i);
String name = node.getNodeName();
- if ("ewayResponse" == name) {
+ if ("ewayResponse".equals(name)) {
continue;
}
Text textnode = (Text) node.getFirstChild();
diff --git
a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
index 5ba0c65130..fac58c164c 100644
---
a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
+++
b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
@@ -260,7 +261,7 @@ public class CatalinaContainer implements Container {
}
virtualHosts.stream()
- .filter(virtualHost -> virtualHost !=
hostName).forEach(virtualHost -> host.addAlias(virtualHost));
+ .filter(virtualHost -> !Objects.equals(virtualHost,
hostName)).forEach(virtualHost -> host.addAlias(virtualHost));
return host;
}
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index d7966c4c7d..1f4f23bfa2 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -1042,7 +1042,7 @@ public final class RequestHandler {
* @param requestResponse
*/
private void setUserMessageResponseToRequest(HttpServletRequest request,
ConfigXMLReader.RequestResponse requestResponse) {
- final String fieldMessageName = requestResponse.getName() == "error"
+ final String fieldMessageName =
"error".equals(requestResponse.getName())
? "_ERROR_MESSAGE_"
: "_EVENT_MESSAGE_";
final String customMessageField = "_CUSTOM" + fieldMessageName;
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
index 7cda0c9ac4..698434ce1e 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
@@ -400,7 +400,7 @@ public final class CommonWidgetModels {
} else {
Node formElement = autoFormParamsElement;
while (formElement != null
- && formElement.getLocalName() != "form") {
+ && !"form".equals(formElement.getLocalName())) {
formElement = formElement.getParentNode();
}
if (formElement != null && formElement.getLocalName() !=
null) {
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
index 9b9db9a621..57d63144e0 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
@@ -2323,7 +2323,7 @@ public abstract class ModelForm extends ModelWidget {
} else {
Node formElement = autoFormParamsElement;
while (formElement != null
- && formElement.getLocalName() != "form") {
+ && !"form".equals(formElement.getLocalName())) {
formElement = formElement.getParentNode();
}
if (formElement != null && formElement.getLocalName() !=
null) {
