From: <rm...@hy...> - 2008-10-29 17:21:16
|
Author: rmorgan Date: 2008-10-29 10:21:01 -0700 (Wed, 29 Oct 2008) New Revision: 11634 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11634 Modified: branches/HQ_3_2/src/org/hyperic/hq/authz/server/session/ResourceDAO.java Log: Fix possible NPE [HHQ-2615] [merge from 4.0] Modified: branches/HQ_3_2/src/org/hyperic/hq/authz/server/session/ResourceDAO.java =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/authz/server/session/ResourceDAO.java 2008-10-29 17:19:44 UTC (rev 11633) +++ branches/HQ_3_2/src/org/hyperic/hq/authz/server/session/ResourceDAO.java 2008-10-29 17:21:01 UTC (rev 11634) @@ -255,7 +255,11 @@ .setInteger(0, id.intValue()) .setInteger(1, typeId.intValue()) .uniqueResult(); - ridCache.put(new Element(key, r.getId())); + + if (r != null) { + ridCache.put(new Element(key, r.getId())); + } + return r; } } |