[gatein-commits] gatein SVN: r2018 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-03-06 16:53:23 -0500 (Sat, 06 Mar 2010)
New Revision: 2018

Modified:
   portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
Log:
GTNPORTAL-784 : "Resources could not be found or the invoker doesn't have adequate privileges to get the resource" errors at startup

Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java	2010-03-06 21:04:00 UTC (rev 2017)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java	2010-03-06 21:53:23 UTC (rev 2018)
@@ -476,18 +476,18 @@
    private String getDefaultConfig(String location, String path) throws Exception
    {
       String s = location + path;
-      log.debug("Attempt to load file " + s);
+      String content = null;
       try
       {
-         String content = IOUtil.getStreamContentAsString(cmanager_.getInputStream(s));
+         log.debug("Attempt to load file " + s);
+         content = IOUtil.getStreamContentAsString(cmanager_.getInputStream(s));
          log.debug("Loaded file from path " + s + " with content " + content);
-         return content;
       }
       catch (Exception ignore)
       {
-         log.debug("Could not get file " + s + " will return null instead", ignore);
-         return null;
+         log.debug("Could not get file " + s + " will return null instead");
       }
+      return content;
    }
 
    public Page createPageFromTemplate(String ownerType, String owner, String temp) throws Exception