Author: ebourg
Date: Wed May 10 08:50:57 2017
New Revision: 1794687
URL: http://svn.apache.org/viewvc?rev=1794687&view=rev
Log:
Removed redundant casts
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
tomcat/trunk/test/org/apache/el/lang/TestELSupport.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed May
10 08:50:57 2017
@@ -1253,7 +1253,7 @@ public class ApplicationContext implemen
Container[] wrappers = context.findChildren();
for (Container wrapper : wrappers) {
- result.put(((Wrapper) wrapper).getName(),
+ result.put(wrapper.getName(),
new ApplicationServletRegistration(
(Wrapper) wrapper, context));
}
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Wed
May 10 08:50:57 2017
@@ -322,7 +322,7 @@ public final class ApplicationFilterConf
}
if (!context.getIgnoreAnnotations()) {
try {
- ((StandardContext)
context).getInstanceManager().destroyInstance(this.filter);
+ context.getInstanceManager().destroyInstance(this.filter);
} catch (Exception e) {
Throwable t = ExceptionUtils
.unwrapInvocationTargetException(e);
@@ -343,7 +343,7 @@ public final class ApplicationFilterConf
private InstanceManager getInstanceManager() {
if (instanceManager == null) {
if (context instanceof StandardContext) {
- instanceManager =
((StandardContext)context).getInstanceManager();
+ instanceManager = context.getInstanceManager();
} else {
instanceManager = new DefaultInstanceManager(null,
new HashMap<String, Map<String, String>>(),
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java Wed May 10
08:50:57 2017
@@ -62,7 +62,7 @@ public class ApplicationPart implements
@Override
public String getHeader(String name) {
if (fileItem instanceof DiskFileItem) {
- return ((DiskFileItem) fileItem).getHeaders().getHeader(name);
+ return fileItem.getHeaders().getHeader(name);
}
return null;
}
@@ -72,7 +72,7 @@ public class ApplicationPart implements
if (fileItem instanceof DiskFileItem) {
LinkedHashSet<String> headerNames = new LinkedHashSet<>();
Iterator<String> iter =
- ((DiskFileItem) fileItem).getHeaders().getHeaderNames();
+ fileItem.getHeaders().getHeaderNames();
while (iter.hasNext()) {
headerNames.add(iter.next());
}
@@ -86,7 +86,7 @@ public class ApplicationPart implements
if (fileItem instanceof DiskFileItem) {
LinkedHashSet<String> headers = new LinkedHashSet<>();
Iterator<String> iter =
- ((DiskFileItem) fileItem).getHeaders().getHeaders(name);
+ fileItem.getHeaders().getHeaders(name);
while (iter.hasNext()) {
headers.add(iter.next());
}
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Wed May 10
08:50:57 2017
@@ -486,7 +486,7 @@ public class AsyncContextImpl implements
private InstanceManager getInstanceManager() {
if (instanceManager == null) {
if (context instanceof StandardContext) {
- instanceManager =
((StandardContext)context).getInstanceManager();
+ instanceManager = context.getInstanceManager();
} else {
instanceManager = new DefaultInstanceManager(null,
new HashMap<String, Map<String, String>>(),
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed May 10
08:50:57 2017
@@ -1274,7 +1274,7 @@ public abstract class ContainerBase exte
List<ObjectName> names = new ArrayList<>(children.size());
for (Container next : children.values()) {
if (next instanceof ContainerBase) {
- names.add(((ContainerBase)next).getObjectName());
+ names.add(next.getObjectName());
}
}
return names.toArray(new ObjectName[names.size()]);
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed May 10
08:50:57 2017
@@ -1711,7 +1711,7 @@ public class StandardWrapper extends Con
keyProperties.append(hostName);
}
- String contextName = ((Context) getParent()).getName();
+ String contextName = getParent().getName();
if (!contextName.startsWith("/")) {
keyProperties.append('/');
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed May
10 08:50:57 2017
@@ -758,14 +758,14 @@ public class DeltaManager extends Cluste
for (SessionMessage smsg : receivedMessageQueue) {
if (!stateTimestampDrop) {
messageReceived(smsg,
- smsg.getAddress() != null ? (Member)
smsg.getAddress() : null);
+ smsg.getAddress() != null ?
smsg.getAddress() : null);
} else {
if (smsg.getEventType() !=
SessionMessage.EVT_GET_ALL_SESSIONS &&
smsg.getTimestamp() >=
stateTransferCreateSendTime) {
// FIXME handle EVT_GET_ALL_SESSIONS later
messageReceived(smsg,
smsg.getAddress() != null ?
- (Member) smsg.getAddress() :
+ smsg.getAddress() :
null);
} else {
if (log.isWarnEnabled()) {
@@ -917,7 +917,7 @@ public class DeltaManager extends Cluste
break;
} //switch
- messageReceived(msg, msg.getAddress() != null ? (Member)
msg.getAddress() : null);
+ messageReceived(msg, msg.getAddress() != null ? msg.getAddress() :
null);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Wed May
10 08:50:57 2017
@@ -310,7 +310,7 @@ public class ReplicationValve
Context context = request.getContext();
boolean isCrossContext = context != null
&& context instanceof StandardContext
- && ((StandardContext) context).getCrossContext();
+ && context.getCrossContext();
try {
if(isCrossContext) {
if(log.isDebugEnabled()) {
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Wed May 10
08:50:57 2017
@@ -33,7 +33,6 @@ import javax.servlet.ServletContext;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Loader;
@@ -396,7 +395,7 @@ public class WebappLoader extends Lifecy
setPermissions();
- ((Lifecycle) classLoader).start();
+ classLoader.start();
String contextName = context.getName();
if (!contextName.startsWith("/")) {
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Wed May 10 08:50:57 2017
@@ -479,7 +479,7 @@ public class HostManagerServlet
try {
Container child = engine.findChild(name);
engine.removeChild(child);
- if ( child instanceof ContainerBase )
((ContainerBase)child).destroy();
+ if ( child instanceof ContainerBase ) child.destroy();
} catch (Exception e) {
writer.println(smClient.getString("hostManagerServlet.exception",
e.toString()));
Modified: tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java Wed May 10
08:50:57 2017
@@ -131,7 +131,7 @@ public class MapperListener extends Life
@Override
protected String getDomainInternal() {
if (service instanceof LifecycleMBeanBase) {
- return ((LifecycleMBeanBase) service).getDomain();
+ return service.getDomain();
} else {
return null;
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Wed May 10
08:50:57 2017
@@ -752,7 +752,7 @@ public class MBeanFactory {
host.removeChild(context);
if(context instanceof StandardContext)
try {
- ((StandardContext)context).destroy();
+ context.destroy();
} catch (Exception e) {
log.warn("Error during context [" + context.getName() + "]
destroy ", e);
}
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java Wed
May 10 08:50:57 2017
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Realm;
import org.apache.catalina.Valve;
@@ -54,8 +53,7 @@ public class StandardEngineSF extends St
if (aEngine instanceof StandardEngine) {
StandardEngine engine = (StandardEngine) aEngine;
// Store nested <Listener> elements
- LifecycleListener listeners[] = ((Lifecycle) engine)
- .findLifecycleListeners();
+ LifecycleListener listeners[] = engine.findLifecycleListeners();
storeElementArray(aWriter, indent, listeners);
// Store nested <Realm> element
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java Wed
May 10 08:50:57 2017
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Realm;
import org.apache.catalina.Valve;
@@ -55,8 +54,7 @@ public class StandardHostSF extends Stor
if (aHost instanceof StandardHost) {
StandardHost host = (StandardHost) aHost;
// Store nested <Listener> elements
- LifecycleListener listeners[] = ((Lifecycle) host)
- .findLifecycleListeners();
+ LifecycleListener listeners[] = host.findLifecycleListeners();
storeElementArray(aWriter, indent, listeners);
// Store nested <Alias> elements
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java Wed
May 10 08:50:57 2017
@@ -19,7 +19,6 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Service;
import org.apache.catalina.core.StandardServer;
@@ -68,8 +67,7 @@ public class StandardServerSF extends St
if (aObject instanceof StandardServer) {
StandardServer server = (StandardServer) aObject;
// Store nested <Listener> elements
- LifecycleListener listeners[] = ((Lifecycle) server)
- .findLifecycleListeners();
+ LifecycleListener listeners[] = server.findLifecycleListeners();
storeElementArray(aWriter, indent, listeners);
/*LifecycleListener listener = null;
for (int i = 0; listener == null && i < listeners.length; i++)
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java
Wed May 10 08:50:57 2017
@@ -21,7 +21,6 @@ import java.io.PrintWriter;
import org.apache.catalina.Engine;
import org.apache.catalina.Executor;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.core.StandardService;
@@ -46,8 +45,7 @@ public class StandardServiceSF extends S
if (aService instanceof StandardService) {
StandardService service = (StandardService) aService;
// Store nested <Listener> elements
- LifecycleListener listeners[] = ((Lifecycle) service)
- .findLifecycleListeners();
+ LifecycleListener listeners[] = service.findLifecycleListeners();
storeElementArray(aWriter, indent, listeners);
// Store nested <Executor> elements
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed May 10 08:50:57 2017
@@ -510,7 +510,7 @@ public abstract class AbstractReplicated
public void transferState() {
try {
Member[] members = getMapMembers();
- Member backup = members.length > 0 ? (Member) members[0] : null;
+ Member backup = members.length > 0 ? members[0] : null;
if (backup != null) {
MapMessage msg = new MapMessage(mapContextName,
getStateMessageType(), false,
null, null, null, null, null);
Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Wed May 10
08:50:57 2017
@@ -230,7 +230,7 @@ public final class ExpressionBuilder imp
"" + methodParameterCount, "" +
node.jjtGetChild(0).jjtGetNumChildren()));
}
} else if (node instanceof AstIdentifier && this.varMapper != null) {
- String variable = ((AstIdentifier) node).getImage();
+ String variable = node.getImage();
// simply capture it
this.varMapper.resolveVariable(variable);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Wed May 10
08:50:57 2017
@@ -330,7 +330,7 @@ class Generator {
}
for (int i = 0; i < namedAttrs.size(); i++) {
attrNames[attrs.getLength() + i] =
- ((NamedAttribute)
namedAttrs.getNode(i)).getQName();
+ namedAttrs.getNode(i).getQName();
}
Arrays.sort(attrNames, Collections.reverseOrder());
if (attrNames.length > 0) {
@@ -3415,8 +3415,7 @@ class Generator {
out.printil("java.lang.String "
+ varName
+ " = "
- + quote(((Node.TemplateText) bodyElement)
- .getText()) + ";");
+ + quote(bodyElement.getText()) + ";");
}
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Wed May
10 08:50:57 2017
@@ -648,7 +648,7 @@ class JspDocumentParser
if (current instanceof Node.NamedAttribute) {
boolean isTrim = ((Node.NamedAttribute)current).isTrim();
- Node.Nodes subElems = ((Node.NamedAttribute)current).getBody();
+ Node.Nodes subElems = current.getBody();
for (int i = 0; subElems != null && i < subElems.size(); i++) {
Node subElem = subElems.getNode(i);
if (!(subElem instanceof Node.TemplateText)) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Wed
May 10 08:50:57 2017
@@ -119,7 +119,7 @@ public class CallMethodRule extends Rule
*/
public CallMethodRule(String methodName) {
- this(0, methodName, 0, (Class[]) null);
+ this(0, methodName, 0, null);
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java Wed
May 10 08:50:57 2017
@@ -41,7 +41,7 @@ public class ObjectCreateRule extends Ru
*/
public ObjectCreateRule(String className) {
- this(className, (String) null);
+ this(className, null);
}
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Wed
May 10 08:50:57 2017
@@ -2424,7 +2424,7 @@ public class TestAsyncContextImpl extend
HttpServletResponse response = (HttpServletResponse)
event
.getSuppliedResponse();
if (!response.isCommitted()) {
- ((HttpServletRequest) event.getSuppliedRequest())
+ event.getSuppliedRequest()
.setAttribute("timeout", Boolean.TRUE);
context.dispatch();
}
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Wed
May 10 08:50:57 2017
@@ -244,7 +244,7 @@ public class ChannelCreator {
byte[] domain = new byte[] {1,2,3,4,5,6,7,8,9,0};
- ((McastService)channel.getMembershipService()).setDomain(domain);
+ channel.getMembershipService().setDomain(domain);
DomainFilterInterceptor filter = new DomainFilterInterceptor();
filter.setDomain(domain);
channel.addInterceptor(filter);
Modified: tomcat/trunk/test/org/apache/el/lang/TestELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/lang/TestELSupport.java?rev=1794687&r1=1794686&r2=1794687&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/lang/TestELSupport.java (original)
+++ tomcat/trunk/test/org/apache/el/lang/TestELSupport.java Wed May 10 08:50:57
2017
@@ -242,15 +242,13 @@ public class TestELSupport {
@Test
public void testCoerceToNumber01() {
- Object result = ELSupport.coerceToNumber(
- null, (Object) null, Integer.class);
+ Object result = ELSupport.coerceToNumber(null, null, Integer.class);
Assert.assertNull("Result: " + result, result);
}
@Test
public void testCoerceToNumber02() {
- Object result = ELSupport.coerceToNumber(
- null, (Object) null, int.class);
+ Object result = ELSupport.coerceToNumber(null, null, int.class);
Assert.assertEquals(Integer.valueOf(0), result);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
