You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/05/05 22:26:22 UTC
svn commit: r1334486 - in /ofbiz/branches/release12.04: ./
framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
Author: jleroux
Date: Sat May 5 20:26:21 2012
New Revision: 1334486
URL: http://svn.apache.org/viewvc?rev=1334486&view=rev
Log:
"Applied fix from trunk for revision: 1334483"
------------------------------------------------------------------------
r1334483 | jleroux | 2012-05-05 22:23:39 +0200 (sam., 05 mai 2012) | 1 line
Simplify code, non functional changes
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1334483
Modified: ofbiz/branches/release12.04/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1334486&r1=1334485&r2=1334486&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/branches/release12.04/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Sat May 5 20:26:21 2012
@@ -631,15 +631,11 @@ public class CatalinaContainer implement
Document webXmlDoc = null;
try {
webXmlDoc = UtilXml.readXmlDocument(webXmlUrl);
- } catch (SAXException se) {
- throw new ContainerException(se);
- } catch (ParserConfigurationException pce) {
- throw new ContainerException(pce);
- } catch (IOException ioe) {
- throw new ContainerException(ioe);
+ } catch (Exception e) {
+ throw new ContainerException(e);
}
- boolean appIsDistributable = webXmlDoc.getElementsByTagName("distributable").getLength() > 0 ? true : false;
+ boolean appIsDistributable = webXmlDoc.getElementsByTagName("distributable").getLength() > 0;
final boolean contextIsDistributable = distribute && appIsDistributable;
// configure persistent sessions