Author: violetagg
Date: Fri Jan 1 19:33:39 2016
New Revision: 1722548
URL: http://svn.apache.org/viewvc?rev=1722548&view=rev
Log:
Variable cannot be null
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
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=1722548&r1=1722547&r2=1722548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java Fri
Jan 1 19:33:39 2016
@@ -60,16 +60,14 @@ public class StandardEngineSF extends St
// Store nested <Realm> element
Realm realm = engine.getRealm();
- if (realm != null) {
- Realm parentRealm = null;
- // TODO is this case possible? (see it a old Server 5.0 impl)
- if (engine.getParent() != null) {
- parentRealm = engine.getParent().getRealm();
- }
- if (realm != parentRealm) {
- storeElement(aWriter, indent, realm);
+ Realm parentRealm = null;
+ // TODO is this case possible? (see it a old Server 5.0 impl)
+ if (engine.getParent() != null) {
+ parentRealm = engine.getParent().getRealm();
+ }
+ if (realm != parentRealm) {
+ storeElement(aWriter, indent, realm);
- }
}
// Store nested <Valve> elements
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1722548&r1=1722547&r2=1722548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java Fri Jan
1 19:33:39 2016
@@ -96,11 +96,9 @@ public class TagPluginManager {
Enumeration<URL> urls =
ctxt.getClassLoader().getResources(META_INF_JASPER_TAG_PLUGINS_XML);
- if (urls != null) {
- while (urls.hasMoreElements()) {
- URL url = urls.nextElement();
- parser.parse(url);
- }
+ while (urls.hasMoreElements()) {
+ URL url = urls.nextElement();
+ parser.parse(url);
}
URL url = ctxt.getResource(TAG_PLUGINS_XML);
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1722548&r1=1722547&r2=1722548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Fri
Jan 1 19:33:39 2016
@@ -802,8 +802,6 @@ public class BaseModelMBean implements D
// Acquire the set of application notifications
MBeanNotificationInfo current[] = getMBeanInfo().getNotifications();
- if (current == null)
- current = new MBeanNotificationInfo[0];
MBeanNotificationInfo response[] =
new MBeanNotificationInfo[current.length + 2];
// Descriptor descriptor = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
