Author: markt
Date: Sun Dec 14 12:32:22 2014
New Revision: 1645449
URL: http://svn.apache.org/r1645449
Log:
Remove unnecessary "x != null" tests before "x instanceof ..." tests
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
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=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Sun Dec 14
12:32:22 2014
@@ -893,11 +893,13 @@ public abstract class ContainerBase exte
logger = null;
getLogger();
Cluster cluster = getClusterInternal();
- if ((cluster != null) && (cluster instanceof Lifecycle))
+ if (cluster instanceof Lifecycle) {
((Lifecycle) cluster).start();
+ }
Realm realm = getRealmInternal();
- if ((realm != null) && (realm instanceof Lifecycle))
+ if (realm instanceof Lifecycle) {
((Lifecycle) realm).start();
+ }
// Start our child containers, if any
Container children[] = findChildren();
@@ -978,11 +980,11 @@ public abstract class ContainerBase exte
// Stop our subordinate components, if any
Realm realm = getRealmInternal();
- if ((realm != null) && (realm instanceof Lifecycle)) {
+ if (realm instanceof Lifecycle) {
((Lifecycle) realm).stop();
}
Cluster cluster = getClusterInternal();
- if ((cluster != null) && (cluster instanceof Lifecycle)) {
+ if (cluster instanceof Lifecycle) {
((Lifecycle) cluster).stop();
}
}
@@ -991,11 +993,11 @@ public abstract class ContainerBase exte
protected void destroyInternal() throws LifecycleException {
Realm realm = getRealmInternal();
- if ((realm != null) && (realm instanceof Lifecycle)) {
+ if (realm instanceof Lifecycle) {
((Lifecycle) realm).destroy();
}
Cluster cluster = getClusterInternal();
- if ((cluster != null) && (cluster instanceof Lifecycle)) {
+ if (cluster instanceof Lifecycle) {
((Lifecycle) cluster).destroy();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sun Dec 14
12:32:22 2014
@@ -4996,8 +4996,9 @@ public class StandardContext extends Con
if (ok) {
// Start our subordinate components, if any
Loader loader = getLoader();
- if ((loader != null) && (loader instanceof Lifecycle))
+ if (loader instanceof Lifecycle) {
((Lifecycle) loader).start();
+ }
// since the loader just started, the webapp classloader is now
// created.
@@ -5021,11 +5022,13 @@ public class StandardContext extends Con
getLogger();
Cluster cluster = getClusterInternal();
- if ((cluster != null) && (cluster instanceof Lifecycle))
+ if (cluster instanceof Lifecycle) {
((Lifecycle) cluster).start();
+ }
Realm realm = getRealmInternal();
- if ((realm != null) && (realm instanceof Lifecycle))
+ if (realm instanceof Lifecycle) {
((Lifecycle) realm).start();
+ }
// Notify our interested LifecycleListeners
fireLifecycleEvent(Lifecycle.CONFIGURE_START_EVENT, null);
@@ -5145,7 +5148,7 @@ public class StandardContext extends Con
try {
// Start manager
Manager manager = getManager();
- if ((manager != null) && (manager instanceof Lifecycle)) {
+ if (manager instanceof Lifecycle) {
((Lifecycle) manager).start();
}
} catch(Exception e) {
@@ -5340,8 +5343,7 @@ public class StandardContext extends Con
filterStop();
Manager manager = getManager();
- if (manager != null && manager instanceof Lifecycle &&
- ((Lifecycle) manager).getState().isAvailable()) {
+ if (manager instanceof Lifecycle && ((Lifecycle)
manager).getState().isAvailable()) {
((Lifecycle) manager).stop();
}
@@ -5376,15 +5378,15 @@ public class StandardContext extends Con
context.clearAttributes();
Realm realm = getRealmInternal();
- if ((realm != null) && (realm instanceof Lifecycle)) {
+ if (realm instanceof Lifecycle) {
((Lifecycle) realm).stop();
}
Cluster cluster = getClusterInternal();
- if ((cluster != null) && (cluster instanceof Lifecycle)) {
+ if (cluster instanceof Lifecycle) {
((Lifecycle) cluster).stop();
}
Loader loader = getLoader();
- if ((loader != null) && (loader instanceof Lifecycle)) {
+ if (loader instanceof Lifecycle) {
((Lifecycle) loader).stop();
}
@@ -5458,12 +5460,12 @@ public class StandardContext extends Con
}
Loader loader = getLoader();
- if ((loader != null) && (loader instanceof Lifecycle)) {
+ if (loader instanceof Lifecycle) {
((Lifecycle) loader).destroy();
}
Manager manager = getManager();
- if ((manager != null) && (manager instanceof Lifecycle)) {
+ if (manager instanceof Lifecycle) {
((Lifecycle) manager).destroy();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Sun Dec 14
12:32:22 2014
@@ -139,11 +139,13 @@ public class StandardService extends Lif
public void setContainer(Container container) {
Container oldContainer = this.container;
- if ((oldContainer != null) && (oldContainer instanceof Engine))
+ if (oldContainer instanceof Engine) {
((Engine) oldContainer).setService(null);
+ }
this.container = container;
- if ((this.container != null) && (this.container instanceof Engine))
+ if (this.container instanceof Engine) {
((Engine) this.container).setService(this);
+ }
if (getState().isAvailable() && (this.container != null)) {
try {
this.container.start();
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=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun Dec 14
12:32:22 2014
@@ -665,7 +665,7 @@ public class StandardWrapper extends Con
if (!getState().isAvailable())
return;
- if (getServlet() != null && (getServlet() instanceof
PeriodicEventListener)) {
+ if (getServlet() instanceof PeriodicEventListener) {
((PeriodicEventListener) getServlet()).periodicEvent();
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java Sun
Dec 14 12:32:22 2014
@@ -76,8 +76,9 @@ public final class StandardWrapperFacade
public ServletContext getServletContext() {
if (context == null) {
context = config.getServletContext();
- if ((context != null) && (context instanceof ApplicationContext))
+ if (context instanceof ApplicationContext) {
context = ((ApplicationContext) context).getFacade();
+ }
}
return (context);
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Sun Dec 14 12:32:22 2014
@@ -96,16 +96,16 @@ public class ClusterSingleSignOn extends
// stop remove cluster binding
if(cluster == null) {
Container host = getContainer();
- if(host != null && host instanceof Host) {
+ if(host instanceof Host) {
cluster = host.getCluster();
- if(cluster != null && cluster instanceof CatalinaCluster) {
+ if(cluster instanceof CatalinaCluster) {
setCluster((CatalinaCluster) cluster);
getCluster().addClusterListener(clusterSSOListener);
} else {
Container engine = host.getParent();
- if(engine != null && engine instanceof Engine) {
+ if(engine instanceof Engine) {
cluster = engine.getCluster();
- if(cluster != null && cluster instanceof
CatalinaCluster) {
+ if(cluster instanceof CatalinaCluster) {
setCluster((CatalinaCluster) cluster);
getCluster().addClusterListener(clusterSSOListener);
}
@@ -168,7 +168,7 @@ public class ClusterSingleSignOn extends
new SingleSignOnMessage(cluster.getLocalMember(),
ssoId, session.getId());
Manager mgr = session.getManager();
- if ((mgr != null) && (mgr instanceof ClusterManager)) {
+ if (mgr instanceof ClusterManager) {
msg.setContextName(((ClusterManager) mgr).getName());
}
@@ -210,7 +210,7 @@ public class ClusterSingleSignOn extends
new SingleSignOnMessage(cluster.getLocalMember(),
ssoId, session.getId());
Manager mgr = session.getManager();
- if ((mgr != null) && (mgr instanceof ClusterManager)) {
+ if (mgr instanceof ClusterManager) {
msg.setContextName(((ClusterManager) mgr).getName());
}
@@ -401,7 +401,7 @@ public class ClusterSingleSignOn extends
ssoId, session.getId());
Manager mgr = session.getManager();
- if ((mgr != null) && (mgr instanceof ClusterManager)) {
+ if (mgr instanceof ClusterManager) {
msg.setContextName(((ClusterManager) mgr).getName());
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
Sun Dec 14 12:32:22 2014
@@ -58,7 +58,7 @@ public class ClusterSingleSignOnListener
*/
@Override
public void messageReceived(ClusterMessage myobj) {
- if (myobj != null && myobj instanceof SingleSignOnMessage) {
+ if (myobj instanceof SingleSignOnMessage) {
SingleSignOnMessage msg = (SingleSignOnMessage) myobj;
int action = msg.getAction();
Session session = null;
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Sun
Dec 14 12:32:22 2014
@@ -87,7 +87,7 @@ public class ReplicatedContext extends S
Map<String,Object> map =
((ReplApplContext)this.context).getAttributeMap();
- if ( map!=null && map instanceof ReplicatedMap) {
+ if (map instanceof ReplicatedMap) {
((ReplicatedMap<?,?>)map).breakdown();
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Sun Dec
14 12:32:22 2014
@@ -100,7 +100,7 @@ public class BackupManager extends Clust
//=========================================================================
@Override
public void objectMadePrimary(Object key, Object value) {
- if (value!=null && value instanceof DeltaSession) {
+ if (value instanceof DeltaSession) {
DeltaSession session = (DeltaSession)value;
synchronized (session) {
session.access();
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Sun Dec 14 12:32:22 2014
@@ -51,7 +51,7 @@ public class ClusterSessionListener exte
*/
@Override
public void messageReceived(ClusterMessage myobj) {
- if (myobj != null && myobj instanceof SessionMessage) {
+ if (myobj instanceof SessionMessage) {
SessionMessage msg = (SessionMessage) myobj;
String ctxname = msg.getContextName();
//check if the message is a EVT_GET_ALL_SESSIONS,
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=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Sun Dec
14 12:32:22 2014
@@ -924,7 +924,7 @@ public class DeltaManager extends Cluste
*/
@Override
public void messageDataReceived(ClusterMessage cmsg) {
- if (cmsg != null && cmsg instanceof SessionMessage) {
+ if (cmsg instanceof SessionMessage) {
SessionMessage msg = (SessionMessage) cmsg;
switch (msg.getEventType()) {
case SessionMessage.EVT_GET_ALL_SESSIONS:
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Sun Dec
14 12:32:22 2014
@@ -441,7 +441,7 @@ public class SimpleTcpCluster extends Li
*/
@Override
public void removeManager(Manager manager) {
- if (manager != null && manager instanceof ClusterManager ) {
+ if (manager instanceof ClusterManager) {
ClusterManager cmgr = (ClusterManager) manager;
// Notify our interested LifecycleListeners
fireLifecycleEvent(BEFORE_MANAGERUNREGISTER_EVENT,manager);
@@ -465,7 +465,7 @@ public class SimpleTcpCluster extends Li
Context context = manager.getContext() ;
if(context != null) {
Container host = context.getParent();
- if(host != null && host instanceof Host && clusterName!=null &&
+ if(host instanceof Host && clusterName!=null &&
!(clusterName.startsWith(host.getName() +"#"))) {
clusterName = host.getName() +"#" + clusterName ;
}
Modified: tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java Sun
Dec 14 12:32:22 2014
@@ -87,17 +87,17 @@ public class SessionUtils {
// First search "known locations"
for (int i = 0; i < LOCALE_TEST_ATTRIBUTES.length; ++i) {
Object obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i]);
- if (null != obj && obj instanceof Locale) {
+ if (obj instanceof Locale) {
locale = (Locale) obj;
break;
}
obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i].toLowerCase(Locale.ENGLISH));
- if (null != obj && obj instanceof Locale) {
+ if (obj instanceof Locale) {
locale = (Locale) obj;
break;
}
obj =
in_session.getAttribute(LOCALE_TEST_ATTRIBUTES[i].toUpperCase(Locale.ENGLISH));
- if (null != obj && obj instanceof Locale) {
+ if (obj instanceof Locale) {
locale = (Locale) obj;
break;
}
@@ -125,7 +125,7 @@ public class SessionUtils {
if (null != readMethod) {
// Call the property getter and return the value
Object possibleLocale =
readMethod.invoke(probableEngine, (Object[]) null);
- if (null != possibleLocale && possibleLocale
instanceof Locale) {
+ if (possibleLocale instanceof Locale) {
locale = (Locale) possibleLocale;
}
}
@@ -148,7 +148,7 @@ public class SessionUtils {
for (Enumeration<String> enumeration =
in_session.getAttributeNames(); enumeration.hasMoreElements();) {
String name = enumeration.nextElement();
Object obj = in_session.getAttribute(name);
- if (null != obj && obj instanceof Locale) {
+ if (obj instanceof Locale) {
localeArray.add(obj);
}
}
@@ -210,7 +210,7 @@ public class SessionUtils {
for (Enumeration<String> enumeration =
httpSession.getAttributeNames(); enumeration.hasMoreElements();) {
String name = enumeration.nextElement();
Object obj = httpSession.getAttribute(name);
- if (null != obj && (obj instanceof Principal || obj instanceof
Subject)) {
+ if (obj instanceof Principal || obj instanceof Subject) {
principalArray.add(obj);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Sun Dec 14 12:32:22 2014
@@ -424,7 +424,7 @@ public abstract class PersistentManagerB
}
}
processPersistenceChecks();
- if ((getStore() != null) && (getStore() instanceof StoreBase)) {
+ if (getStore() instanceof StoreBase) {
((StoreBase) getStore()).processExpires();
}
@@ -875,8 +875,9 @@ public abstract class PersistentManagerB
}
}
- if (getStore() != null && getStore() instanceof Lifecycle)
+ if (getStore() instanceof Lifecycle) {
((Lifecycle)getStore()).stop();
+ }
// Require a new random number generator if we are restarted
super.stopInternal();
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Sun Dec 14 12:32:22 2014
@@ -315,9 +315,9 @@ public class StandardContextSF extends S
File file = new File(System.getProperty("catalina.base"), "conf");
Container host = context.getParent();
- if ((host != null) && (host instanceof Host)) {
+ if (host instanceof Host) {
Container engine = host.getParent();
- if ((engine != null) && (engine instanceof Engine)) {
+ if (engine instanceof Engine) {
file = new File(file, engine.getName());
}
file = new File(file, host.getName());
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=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Sun Dec 14 12:32:22 2014
@@ -648,7 +648,7 @@ public abstract class AbstractReplicated
entry.setProxy(false);
entry.setBackupNodes(mapmsg.getBackupNodes());
entry.setPrimary(mapmsg.getPrimary());
- if (mapmsg.getValue()!=null && mapmsg.getValue() instanceof
ReplicatedMapEntry ) {
+ if (mapmsg.getValue() instanceof ReplicatedMapEntry ) {
((ReplicatedMapEntry)mapmsg.getValue()).setOwner(getMapOwner());
}
} else {
@@ -925,7 +925,7 @@ public abstract class AbstractReplicated
if ( dest!=null && dest.length >0) {
getChannel().send(dest, msg, getChannelSendOptions());
}
- if ( entry.getValue() != null && entry.getValue()
instanceof ReplicatedMapEntry ) {
+ if (entry.getValue() instanceof ReplicatedMapEntry) {
ReplicatedMapEntry val =
(ReplicatedMapEntry)entry.getValue();
val.setOwner(getMapOwner());
}
@@ -1164,7 +1164,7 @@ public abstract class AbstractReplicated
}
public boolean isValueSerializable() {
- return (value==null) || (value instanceof Serializable);
+ return (value == null) || (value instanceof Serializable);
}
public boolean isSerializable() {
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Sun Dec
14 12:32:22 2014
@@ -286,7 +286,7 @@ public class JspServletWrapper {
} else {
target = getServlet();
}
- if (target != null && target instanceof JspSourceDependent) {
+ if (target instanceof JspSourceDependent) {
return ((JspSourceDependent) target).getDependants();
}
} catch (AbstractMethodError ame) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Sun Dec 14
12:32:22 2014
@@ -182,7 +182,7 @@ public class Nio2Endpoint extends Abstra
} else {
try {
SocketAddress sa = ssc.getLocalAddress();
- if (sa != null && sa instanceof InetSocketAddress) {
+ if (sa instanceof InetSocketAddress) {
return ((InetSocketAddress) sa).getPort();
} else {
return -1;
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java?rev=1645449&r1=1645448&r2=1645449&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
Sun Dec 14 12:32:22 2014
@@ -131,7 +131,7 @@ public class TestSwallowAbortedUploads e
AbortedUploadClient client = new AbortedUploadClient();
Exception ex = doAbortedUploadTest(client, true, false);
assertTrue("Limited upload with swallow disabled does not generate
client exception",
- ex != null && ex instanceof java.net.SocketException);
+ ex instanceof java.net.SocketException);
client.reset();
}
@@ -177,7 +177,7 @@ public class TestSwallowAbortedUploads e
AbortedPOSTClient client = new AbortedPOSTClient();
Exception ex = doAbortedPOSTTest(client,
HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE, false);
assertTrue("Limited upload with swallow disabled does not generate
client exception",
- ex != null && ex instanceof java.net.SocketException);
+ ex instanceof java.net.SocketException);
client.reset();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
