From: <rm...@hy...> - 2007-05-31 00:18:10
|
Author: rmorgan Date: 2007-05-30 17:18:07 -0700 (Wed, 30 May 2007) New Revision: 4581 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=4581 Modified: trunk/src/org/hyperic/hq/measurement/server/session/SRNManagerEJBImpl.java Log: Always pull SRN from DAO when incrementing SRN. Modified: trunk/src/org/hyperic/hq/measurement/server/session/SRNManagerEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/measurement/server/session/SRNManagerEJBImpl.java 2007-05-30 23:56:40 UTC (rev 4580) +++ trunk/src/org/hyperic/hq/measurement/server/session/SRNManagerEJBImpl.java 2007-05-31 00:18:07 UTC (rev 4581) @@ -153,13 +153,15 @@ */ public int incrementSrn(AppdefEntityID aid, long newMin) { SRNCache cache = SRNCache.getInstance(); + ScheduleRevNumDAO dao = getScheduleRevNumDAO(); + SrnId id = new SrnId(aid.getType(), aid.getID()); - ScheduleRevNum srn = cache.get(id); + ScheduleRevNum srn = dao.get(id); // Create the SRN if it does not already exist. if (srn == null) { // Create it - srn = getScheduleRevNumDAO().create(aid.getType(), aid.getID()); + srn = dao.create(aid.getType(), aid.getID()); cache.put(srn); return srn.getSrn(); } @@ -173,10 +175,11 @@ srn.setMinInterval(newMin); } else { // Set to default - Long defaultMin = getScheduleRevNumDAO().getMinInterval(aid); + Long defaultMin = dao.getMinInterval(aid); srn.setMinInterval(defaultMin.longValue()); } - getScheduleRevNumDAO().save(srn); + dao.save(srn); + cache.put(srn); } _log.debug("Updated SRN for "+ aid + " to " + srn.getSrn()); return srn.getSrn(); |