From: <cl...@hy...> - 2008-08-28 16:19:56
|
Author: clee Date: 2008-08-28 09:19:49 -0700 (Thu, 28 Aug 2008) New Revision: 10916 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=10916 Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceGroup.java trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java Log: [HHQ-2060] Get the owner of the resource, not the caller. This is the actual fix, revert previous commit. Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceGroup.java =================================================================== --- trunk/src/org/hyperic/hq/authz/server/session/ResourceGroup.java 2008-08-28 07:21:26 UTC (rev 10915) +++ trunk/src/org/hyperic/hq/authz/server/session/ResourceGroup.java 2008-08-28 16:19:49 UTC (rev 10916) @@ -6,7 +6,7 @@ * normal use of the program, and does *not* fall under the heading of * "derived work". * - * Copyright (C) [2004-2008], Hyperic, Inc. + * Copyright (C) [2004, 2005, 2006], Hyperic, Inc. * This file is part of HQ. * * HQ is free software; you can redistribute it and/or modify @@ -130,34 +130,6 @@ return true; } - /* (non-Javadoc) - * @see org.hyperic.hq.authz.server.session.AuthzNamedBean#getName() - */ - public String getName() { - return _resource.getName(); - } - - /* (non-Javadoc) - * @see org.hyperic.hq.authz.server.session.AuthzNamedBean#getSortName() - */ - public String getSortName() { - return _resource.getSortName(); - } - - /* (non-Javadoc) - * @see org.hyperic.hq.authz.server.session.AuthzNamedBean#setName(java.lang.String) - */ - public void setName(String name) { - _resource.setName(name); - } - - /* (non-Javadoc) - * @see org.hyperic.hq.authz.server.session.AuthzNamedBean#setSortName(java.lang.String) - */ - public void setSortName(String sortName) { - _resource.setSortName(sortName); - } - public String getDescription() { return _description; } Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java 2008-08-28 07:21:26 UTC (rev 10915) +++ trunk/src/org/hyperic/hq/authz/server/session/ResourceGroupManagerEJBImpl.java 2008-08-28 16:19:49 UTC (rev 10916) @@ -673,7 +673,7 @@ retVal.setMTime(new Long(g.getMtime())); retVal.setCTime(new Long(g.getCtime())); retVal.setModifiedBy(g.getModifiedBy()); - retVal.setOwner(subj.getName()); + retVal.setOwner(g.getResource().getOwner().getName()); // Add the group members for (Iterator i = members.iterator(); i.hasNext();) { |