Author: violetagg
Date: Sat Jan 2 17:37:54 2016
New Revision: 1722646
URL: http://svn.apache.org/viewvc?rev=1722646&view=rev
Log:
Variable cannot be null
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Sat
Jan 2 17:37:54 2016
@@ -3036,7 +3036,7 @@ public class Request
if (!create) {
return (null);
}
- if ((context != null) && (response != null) &&
+ if ((response != null) &&
context.getServletContext().getEffectiveSessionTrackingModes().
contains(SessionTrackingMode.COOKIE) &&
response.getResponse().isCommitted()) {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardServer.java Sat
Jan 2 17:37:54 2016
@@ -77,10 +77,8 @@ public final class StandardServer extend
globalNamingResources.setContainer(this);
if (isUseNaming()) {
- if (namingContextListener == null) {
- namingContextListener = new NamingContextListener();
- addLifecycleListener(namingContextListener);
- }
+ namingContextListener = new NamingContextListener();
+ addLifecycleListener(namingContextListener);
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Sat Jan 2 17:37:54 2016
@@ -758,17 +758,13 @@ public abstract class WebappClassLoaderB
*/
public void setWorkDir(File workDir) {
this.loaderDir = new File(workDir, "loader");
- if (loaderDir == null) {
- canonicalLoaderDir = null;
- } else {
- try {
- canonicalLoaderDir = loaderDir.getCanonicalPath();
- if (!canonicalLoaderDir.endsWith(File.separator)) {
- canonicalLoaderDir += File.separator;
- }
- } catch (IOException ioe) {
- canonicalLoaderDir = null;
+ try {
+ canonicalLoaderDir = loaderDir.getCanonicalPath();
+ if (!canonicalLoaderDir.endsWith(File.separator)) {
+ canonicalLoaderDir += File.separator;
}
+ } catch (IOException ioe) {
+ canonicalLoaderDir = null;
}
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Sat
Jan 2 17:37:54 2016
@@ -280,7 +280,7 @@ public final class TldConfig implements
log.debug(sm.getString("tldConfig.addListeners",
Integer.valueOf(list.length)));
- for( int i=0; list!=null && i<list.length; i++ ) {
+ for( int i=0; i<list.length; i++ ) {
context.addApplicationListener(
new ApplicationListener(list[i], true));
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
Sat Jan 2 17:37:54 2016
@@ -196,11 +196,9 @@ class JspDocumentParser
} catch (EnableDTDValidationException e) {
saxParser = getSAXParser(true, jspDocParser);
jspDocParser.isValidating = true;
- if (inStream != null) {
- try {
- inStream.close();
- } catch (Exception any) {
- }
+ try {
+ inStream.close();
+ } catch (Exception any) {
}
inStream = JspUtil.getInputStream(path, jarFile,
jspDocParser.ctxt,
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
Sat Jan 2 17:37:54 2016
@@ -130,9 +130,6 @@ public class TagPluginManager {
ParserUtils pu = new ParserUtils(false, blockExternal);
TreeNode root = pu.parseXMLDocument(TAG_PLUGINS_XML, is);
- if (root == null) {
- return;
- }
if (!TAG_PLUGINS_ROOT_ELEM.equals(root.getName())) {
err.jspError("jsp.error.plugin.wrongRootElement", TAG_PLUGINS_XML,
@@ -161,13 +158,10 @@ public class TagPluginManager {
Class<?> pluginClass =
ctxt.getClassLoader().loadClass(pluginClassStr);
tagPlugin = (TagPlugin) pluginClass.newInstance();
+ tagPlugins.put(tagClass, tagPlugin);
} catch (Exception e) {
throw new JasperException(e);
}
- if (tagPlugin == null) {
- return;
- }
- tagPlugins.put(tagClass, tagPlugin);
}
initialized = true;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Sat Jan 2 17:37:54 2016
@@ -244,11 +244,9 @@ public class TldLocationsCache {
tldScanResourcePaths(WEB_INF);
JarScanner jarScanner = JarScannerFactory.getJarScanner(ctxt);
- if (jarScanner != null) {
- jarScanner.scan(ctxt,
- Thread.currentThread().getContextClassLoader(),
- new TldJarScannerCallback(), noTldJars);
- }
+ jarScanner.scan(ctxt,
+ Thread.currentThread().getContextClassLoader(),
+ new TldJarScannerCallback(), noTldJars);
initialized = true;
} catch (Exception ex) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1722646&r1=1722645&r2=1722646&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Sat Jan 2 17:37:54 2016
@@ -797,8 +797,6 @@ public class FileDirContext extends Base
if ((absoluteBase.length() < absPath.length())
&& (absoluteBase.length() < canPath.length())) {
absPath = absPath.substring(absoluteBase.length() + 1);
- if (absPath == null)
- return null;
if (absPath.equals(""))
absPath = "/";
canPath = canPath.substring(absoluteBase.length() + 1);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
