From 199c7944b415ba52f332046f21be0bf7ec8b26cc Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 23 Apr 2010 15:09:58 +0000 Subject: [PATCH] Remove unnecessary instanceof tests ID'd by FindBugs git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@937325 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/catalina/ha/session/DeltaManager.java | 2 +- java/org/apache/el/lang/ExpressionBuilder.java | 35 +++++++++++----------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java index 5c34797a4..f1546b6a1 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -882,7 +882,7 @@ public class DeltaManager extends ClusterManagerBase{ if(replicationValve == null) { if(container instanceof StandardContext && ((StandardContext)container).getCrossContext()) { Cluster cluster = getCluster() ; - if(cluster != null && cluster instanceof CatalinaCluster) { + if(cluster != null) { Valve[] valves = ((CatalinaCluster)cluster).getValves(); if(valves != null && valves.length > 0) { for(int i=0; replicationValve == null && i < valves.length ; i++ ){ diff --git a/java/org/apache/el/lang/ExpressionBuilder.java b/java/org/apache/el/lang/ExpressionBuilder.java index 48759197e..80eb7153d 100644 --- a/java/org/apache/el/lang/ExpressionBuilder.java +++ b/java/org/apache/el/lang/ExpressionBuilder.java @@ -94,28 +94,27 @@ public final class ExpressionBuilder implements NodeVisitor { .CompositeExpression(); // validate composite expression - if (n instanceof AstCompositeExpression) { - int numChildren = n.jjtGetNumChildren(); - if (numChildren == 1) { - n = n.jjtGetChild(0); - } else { - Class type = null; - Node child = null; - for (int i = 0; i < numChildren; i++) { - child = n.jjtGetChild(i); - if (child instanceof AstLiteralExpression) - continue; - if (type == null) - type = child.getClass(); - else { - if (!type.equals(child.getClass())) { - throw new ELException(MessageFactory.get( - "error.mixed", expr)); - } + int numChildren = n.jjtGetNumChildren(); + if (numChildren == 1) { + n = n.jjtGetChild(0); + } else { + Class type = null; + Node child = null; + for (int i = 0; i < numChildren; i++) { + child = n.jjtGetChild(i); + if (child instanceof AstLiteralExpression) + continue; + if (type == null) + type = child.getClass(); + else { + if (!type.equals(child.getClass())) { + throw new ELException(MessageFactory.get( + "error.mixed", expr)); } } } } + if (n instanceof AstDeferredExpression || n instanceof AstDynamicExpression) { n = n.jjtGetChild(0); -- 2.11.0