You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/11/09 11:02:10 UTC
svn commit: r1846232 - in /tomcat/trunk/java/org/apache/catalina:
startup/CatalinaBaseConfigurationSource.java startup/ContextConfig.java
valves/rewrite/RewriteValve.java
Author: markt
Date: Fri Nov 9 11:02:10 2018
New Revision: 1846232
URL: http://svn.apache.org/viewvc?rev=1846232&view=rev
Log:
Fix null warnings in IDE
Modified:
tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java?rev=1846232&r1=1846231&r2=1846232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java Fri Nov 9 11:02:10 2018
@@ -64,7 +64,8 @@ public class CatalinaBaseConfigurationSo
}
}
}
- if (result == null) {
+
+ if (result == null && ioe != null) {
throw ioe;
} else {
return result;
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1846232&r1=1846231&r2=1846232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Nov 9 11:02:10 2018
@@ -1898,7 +1898,7 @@ public class ContextConfig implements Li
try {
stream = webXmlResource.getInputStream();
source = new InputSource(webXmlResource.getURI().toString());
- if (stream != null && source != null) {
+ if (stream != null) {
source.setByteStream(stream);
}
} catch (Exception e) {
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1846232&r1=1846231&r2=1846232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Fri Nov 9 11:02:10 2018
@@ -143,7 +143,7 @@ public class RewriteValve extends ValveB
ConfigurationSource.Resource resource = ConfigFileLoader.getSource().getConfResource(resourceName);
is = resource.getInputStream();
} catch (IOException e) {
- if ((is == null) && (containerLog.isDebugEnabled())) {
+ if (containerLog.isDebugEnabled()) {
containerLog.debug("No configuration resource found: " + resourceName, e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org