From: <cl...@hy...> - 2008-10-15 19:13:08
|
Author: clee Date: 2008-10-15 12:12:59 -0700 (Wed, 15 Oct 2008) New Revision: 11489 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11489 Modified: trunk/src/org/hyperic/hq/appdef/server/session/PlatformManagerEJBImpl.java Log: Need to load platform's resource so that the POJO can return name outside of transaction Modified: trunk/src/org/hyperic/hq/appdef/server/session/PlatformManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/appdef/server/session/PlatformManagerEJBImpl.java 2008-10-15 18:57:45 UTC (rev 11488) +++ trunk/src/org/hyperic/hq/appdef/server/session/PlatformManagerEJBImpl.java 2008-10-15 19:12:59 UTC (rev 11489) @@ -84,8 +84,6 @@ import org.hyperic.hq.authz.shared.PermissionException; import org.hyperic.hq.authz.shared.ResourceGroupManagerLocal; import org.hyperic.hq.authz.shared.ResourceManagerLocal; -import org.hyperic.hq.authz.shared.ResourceValue; -import org.hyperic.hq.autoinventory.AIIp; import org.hyperic.hq.common.ApplicationException; import org.hyperic.hq.common.SystemException; import org.hyperic.hq.common.VetoException; @@ -561,14 +559,16 @@ throws PlatformNotFoundException, PermissionException { Platform platform = findPlatformById(id); checkViewPermission(subject, platform.getEntityId()); + // Make sure that resource is loaded as to not get + // LazyInitializationException + platform.getName(); return platform; } /** * Find a Platform by Id. * - * @param id - * The id to look up. + * @param id The id to look up. * @return A Platform object representing this Platform. * @throws PlatformNotFoundException * If the given Platform is not found. @@ -576,11 +576,16 @@ */ public Platform findPlatformById(Integer id) throws PlatformNotFoundException { - Platform res = getPlatformDAO().get(id); + Platform platform = getPlatformDAO().get(id); - if (res == null) + if (platform == null) throw new PlatformNotFoundException(id); - return res; + + // Make sure that resource is loaded as to not get + // LazyInitializationException + platform.getName(); + + return platform; } /** |