You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/15 23:55:51 UTC
cvs commit: jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment WebXmlMerger.java
cmlenz 2003/05/15 14:55:51
Modified: integration/ant/src/java/org/apache/cactus/integration/ant/deployment
WebXmlMerger.java
Log:
Avoid check for null by reversing the logic
Revision Changes Path
1.3 +4 -7 jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WebXmlMerger.java
Index: WebXmlMerger.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/ant/src/java/org/apache/cactus/integration/ant/deployment/WebXmlMerger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebXmlMerger.java 15 May 2003 20:22:42 -0000 1.2
+++ WebXmlMerger.java 15 May 2003 21:55:51 -0000 1.3
@@ -107,14 +107,12 @@
public final void merge(WebXml theMergeWebXml)
{
checkServletVersions(theMergeWebXml);
- if ((this.webXml.getVersion() != null)
- && (this.webXml.getVersion().compareTo(WebXmlVersion.V2_3) >= 0))
+ if (WebXmlVersion.V2_3.compareTo(this.webXml.getVersion()) <= 0)
{
mergeFilters(theMergeWebXml);
}
mergeServlets(theMergeWebXml);
- if ((this.webXml.getVersion() != null)
- && (this.webXml.getVersion().compareTo(WebXmlVersion.V2_3) >= 0))
+ if (WebXmlVersion.V2_3.compareTo(this.webXml.getVersion()) <= 0)
{
mergeResourceEnvironmentReferences(theMergeWebXml);
}
@@ -124,8 +122,7 @@
mergeSecurityRoles(theMergeWebXml);
mergeEnvironmentEntries(theMergeWebXml);
mergeEjbRefs(theMergeWebXml);
- if ((this.webXml.getVersion() != null)
- && (this.webXml.getVersion().compareTo(WebXmlVersion.V2_3) >= 0))
+ if (WebXmlVersion.V2_3.compareTo(this.webXml.getVersion()) <= 0)
{
mergeEjbLocalRefs(theMergeWebXml);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org