Permalink
Browse files

Hand merge null check for getResource(id) from 2.x tree.

  • Loading branch information...
1 parent d300654 commit 88b6214fd6a243296e8d2d8ccb9307007d9067ce Ryan Morgan committed Sep 30, 2009
Showing with 5 additions and 0 deletions.
  1. +5 −0 hqu/hqapi1/app/ApiController.groovy
@@ -43,6 +43,11 @@ class ApiController extends BaseController {
* null is returned.
*/
protected getResource(id) {
+
+ if (id == null) {
+ return null
+ }
+
def resource = resourceHelper.findById(id)
if (!resource) {

0 comments on commit 88b6214

Please sign in to comment.