[Hyperic-hq-discuss] hq r11632 - trunk/src/org/hyperic/hq/authz/server/session

[<rm...@hy...>]

Author: rmorgan
Date: 2008-10-29 10:18:06 -0700 (Wed, 29 Oct 2008)
New Revision: 11632
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=11632

Modified:
   trunk/src/org/hyperic/hq/authz/server/session/ResourceDAO.java
Log:
Fix possible NPE [HHQ-2615]

Modified: trunk/src/org/hyperic/hq/authz/server/session/ResourceDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/server/session/ResourceDAO.java	2008-10-29 16:54:26 UTC (rev 11631)
+++ trunk/src/org/hyperic/hq/authz/server/session/ResourceDAO.java	2008-10-29 17:18:06 UTC (rev 11632)
@@ -159,7 +159,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;
         }
     }