This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new f45b2169 Flip null test
f45b2169 is described below
commit f45b2169629cf9f36bcae9bfa1e58efb6c59a883
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jul 5 09:38:47 2026 -0400
Flip null test
---
core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java | 4 ++--
core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java | 2 +-
.../main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java | 4 ++--
core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java | 4 ++--
core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java | 2 +-
core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java | 2 +-
core/src/test/java/org/apache/commons/jelly/core/Customer.java | 2 +-
.../src/test/java/org/apache/commons/jelly/tags/bean/Customer.java | 2 +-
.../main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java | 2 +-
.../org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java | 2 +-
.../java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java | 2 +-
.../src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
index 5872afb4..f8fdd835 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
@@ -236,7 +236,7 @@ public class ArgTag extends BaseClassLoaderTag {
assertNotNull(value);
break;
default:
- if (null != typeString) {
+ if (typeString != null) {
try {
// klass = getClassLoader().loadClass(typeString);
// JELLY-274: rather use the three args static
class-load-method
@@ -251,7 +251,7 @@ public class ArgTag extends BaseClassLoaderTag {
}
break;
}
- } else if (null != typeString) {
+ } else if (typeString != null) {
try {
// klass = getClassLoader().loadClass(typeString);
// JELLY-274: rather use the three args static class-load-method
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
index 35893717..8a4f5552 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/CaseTag.java
@@ -59,7 +59,7 @@ public class CaseTag extends TagSupport {
final Object value = valueExpression.evaluate(context);
if (tag.isFallingThru() ||
null == tag.getValue() && null == value ||
- null != tag.getValue() && tag.getValue().equals(value)) {
+ tag.getValue() != null && tag.getValue().equals(value)) {
tag.caseMatched();
tag.setFallingThru(fallThru);
invokeBody(output);
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
index 8bad01ed..1b9946ed 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java
@@ -101,12 +101,12 @@ public class InvokeStaticTag extends TagSupport
implements ArgTagParent {
final Class[] types = (Class[])paramTypes.toArray(new
Class[paramTypes.size()]);
final Method method = loadClass().getMethod( methodName, types );
final Object result = method.invoke( null, values );
- if (null != var) {
+ if (var != null) {
context.setVariable(var, result);
}
final ArgTag parentArg =
(ArgTag)findAncestorWithClass(ArgTag.class);
- if (null != parentArg) {
+ if (parentArg != null) {
parentArg.setValue(result);
}
}
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
index 6964343a..20b2cd51 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/InvokeTag.java
@@ -91,10 +91,10 @@ public class InvokeTag extends TagSupport implements
ArgTagParent {
}
final ArgTag parentArg = (ArgTag)findAncestorWithClass(ArgTag.class);
- if (null != parentArg) {
+ if (parentArg != null) {
parentArg.setValue(result);
}
- if (null != var) {
+ if (var != null) {
context.setVariable(var, result);
}
}
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
index 1c70ea21..ad6c7707 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/NewTag.java
@@ -75,7 +75,7 @@ public class NewTag extends BaseClassLoaderTag implements
ArgTagParent {
paramTypes.clear();
paramValues.clear();
}
- if (null != var) {
+ if (var != null) {
context.setVariable(var, object);
} else {
parentArg.setValue(object);
diff --git
a/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
b/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
index de1a8cd0..018c09a8 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
@@ -190,7 +190,7 @@ public class UseBeanTag extends MapTagSupport implements
BeanSource {
context.setVariable(var, bean);
} else {
final ArgTag parentArg = (ArgTag)
findAncestorWithClass(ArgTag.class);
- if (null != parentArg) {
+ if (parentArg != null) {
parentArg.setValue(bean);
}
}
diff --git a/core/src/test/java/org/apache/commons/jelly/core/Customer.java
b/core/src/test/java/org/apache/commons/jelly/core/Customer.java
index 55d05ae4..1577be2c 100644
--- a/core/src/test/java/org/apache/commons/jelly/core/Customer.java
+++ b/core/src/test/java/org/apache/commons/jelly/core/Customer.java
@@ -38,7 +38,7 @@ public class Customer {
setCity(cust.getCity());
setLocation(cust.getLocation());
final List list = cust.getOrders();
- if (null != list) {
+ if (list != null) {
for(final Iterator iter = list.iterator();iter.hasNext();) {
addOrder((Order)iter.next());
}
diff --git
a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
index 98de0769..48cdfed6 100644
---
a/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
+++
b/jelly-tags/bean/src/test/java/org/apache/commons/jelly/tags/bean/Customer.java
@@ -36,7 +36,7 @@ public class Customer {
setName(cust.getName());
setLocation(cust.getLocation());
final List list = cust.getOrders();
- if (null != list) {
+ if (list != null) {
for(final Iterator iter = list.iterator();iter.hasNext();) {
addOrder((Order)iter.next());
}
diff --git
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java
index e2dfe025..3b579fcc 100644
---
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java
+++
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/HttpContextTag.java
@@ -103,7 +103,7 @@ public class HttpContextTag extends TagSupport {
throw new JellyTagException(e);
}
- if (null != getRealmName()) {
+ if (getRealmName() != null) {
_context.setRealmName(getRealmName());
}
httpserver.addContext(_context);
diff --git
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
index 7ed6dd3f..2962a987 100644
---
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
+++
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JellyResourceHttpHandler.java
@@ -96,7 +96,7 @@ final class JellyResourceHttpHandler extends
AbstractHttpHandler {
throws HttpException, IOException
{
final Tag handlerTag = (Tag)
_tagMap.get(request.getMethod().toLowerCase());
- if (null != handlerTag) {
+ if (handlerTag != null) {
// setup the parameters in the jelly context
final JellyContext jellyContext = handlerTag.getContext();
jellyContext.setVariable( "pathInContext", pathInContext);
diff --git
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java
index 36a5a0ef..28a3a936 100644
---
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java
+++
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/ResponseHeaderTag.java
@@ -55,7 +55,7 @@ public class ResponseHeaderTag extends TagSupport {
// if value is valid then set it
// otherwise remove the field
- if (null != getValue()) {
+ if (getValue() != null) {
httpResponse.setField(getName(), getValue());
} else {
httpResponse.removeField(getName());
diff --git
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
index 990692d2..d4ea982f 100644
---
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
+++
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/TransformTag.java
@@ -622,7 +622,7 @@ public class TransformTag extends ParseTag {
*/
protected SAXSource getObjAsSAXSource(final Object saxSourceObj) {
SAXSource saxSource = null;
- if (null != saxSourceObj) {
+ if (saxSourceObj != null) {
if (saxSourceObj instanceof Document) {
saxSource = new DocumentSource((Document) saxSourceObj);
} else {
