Author: hoang_to
Date: 2010-04-09 05:44:03 -0400 (Fri, 09 Apr 2010)
New Revision: 2549
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java
Log:
GTNPORTAL-944: Rollback MainResourceResolver to revision 2532
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java
===================================================================
---
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2010-04-09
09:29:48 UTC (rev 2548)
+++
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2010-04-09
09:44:03 UTC (rev 2549)
@@ -94,21 +94,13 @@
//
if (context == null)
{
- String message = "Could not resolve " + targetedContextPath + "
resource for path " + path;
- log.warn(message);
- throw new ResourceNotFoundException(path, message);
+ log.warn("Could not resolve " + targetedContextPath + " resource
for path " + path);
+ return null;
}
else
{
- Resource resource = context.getResource(path.substring(i1));
- if(resource == null)
- {
- throw new ResourceNotFoundException(path, "Could not resolve resource
with path " + path.substring(i1) + " under context path " +
targetedContextPath);
- }
- else
- {
- return resource;
- }
+ return context.getResource(path.substring(i1));
}
+
}
}