svn commit: r536687 - /ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

[jaz-3]

Author: jaz
Date: Wed May  9 15:12:10 2007
New Revision: 536687

URL: http://svn.apache.org/viewvc?view=rev&rev=536687
Log:
fixed bad conditions

Modified:
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?view=diff&rev=536687&r1=536686&r2=536687
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Wed May  9 15:12:10 2007
@@ -186,7 +186,7 @@
 
         // create the engines
         List engineProps = cc.getPropertiesWithValue("engine");
-        if (engineProps == null && engineProps.size() == 0) {
+        if (engineProps == null || engineProps.size() == 0) {
             throw new ContainerException("Cannot load CatalinaContainer; no engines defined!");
         }
         Iterator ei = engineProps.iterator();
@@ -200,7 +200,7 @@
 
         // create the connectors
         List connectorProps = cc.getPropertiesWithValue("connector");
-        if (connectorProps == null && connectorProps.size() == 0) {
+        if (connectorProps == null || connectorProps.size() == 0) {
             throw new ContainerException("Cannot load CatalinaContainer; no connectors defined!");
         }
         Iterator ci = connectorProps.iterator();
@@ -630,7 +630,7 @@
         URL xmlUrl = UtilURL.fromResource("mime-type.xml");
 
         // read the document
-        Document mimeTypeDoc = null;
+        Document mimeTypeDoc;
         try {
             mimeTypeDoc = UtilXml.readXmlDocument(xmlUrl, true);
         } catch (SAXException e) {