Updated Branches: refs/heads/spring-modularization cb7ae26f3 -> 7c72aa96d
ConcurrentHashMap will through NPE on null key Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c72aa96 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c72aa96 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c72aa96 Branch: refs/heads/spring-modularization Commit: 7c72aa96dad1b0a5563aec938ffbe828c6939f0a Parents: cb7ae26 Author: Darren Shepherd <darren.s.sheph...@gmail.com> Authored: Fri Oct 4 16:55:10 2013 -0700 Committer: Darren Shepherd <darren.s.sheph...@gmail.com> Committed: Fri Oct 4 16:56:48 2013 -0700 ---------------------------------------------------------------------- .../storage/datastore/provider/DataStoreProviderManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c72aa96/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java index c5d904b..e186bd8 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java @@ -58,6 +58,9 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto @Override public DataStoreProvider getDataStoreProvider(String name) { + if (name == null) + return null; + return providerMap.get(name); }
