From b3c178480b4760c2cc66b8319333ae34a8dca1d2 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren.s.shepherd@gmail.com>
Date: Fri, 4 Oct 2013 17:05:15 -0700
Subject: [PATCH] Check for null just in case

This code was recently switched from using HashMap to ConcurrentHashMap.
ConcurrentHashMap does not accept null keys and will through a NPE.  Adding
a null check just in case somebody passes null.
---
 .../src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
index d0effaba607..ace7c9127b5 100644
--- a/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
+++ b/server/src/com/cloud/hypervisor/HypervisorGuruManagerImpl.java
@@ -57,6 +57,10 @@ public class HypervisorGuruManagerImpl extends ManagerBase implements Hypervisor
 
     @Override
     public HypervisorGuru getGuru(HypervisorType hypervisorType) {
+        if (hypervisorType == null) {
+            return null;
+        }
+
         HypervisorGuru result = _hvGurus.get(hypervisorType);
 
         if ( result == null ) {