From cbbf80cee3061d4b420dba6f578bb43076ec1e66 Mon Sep 17 00:00:00 2001 From: frank Date: Tue, 9 Aug 2011 15:55:45 -0700 Subject: [PATCH] Use class.getSimpleName in ResourceListener --- core/src/com/cloud/resource/ResourceListener.java | 2 -- server/src/com/cloud/resource/ResourceManagerImpl.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/com/cloud/resource/ResourceListener.java b/core/src/com/cloud/resource/ResourceListener.java index a94e3940629..d44bb2b4fbc 100755 --- a/core/src/com/cloud/resource/ResourceListener.java +++ b/core/src/com/cloud/resource/ResourceListener.java @@ -17,8 +17,6 @@ public interface ResourceListener { static final Integer EVENT_PREPARE_MAINTENANCE_AFTER = 0x1 << 7; static final Integer EVENT_ALL = (EVENT_DISCOVER_BEFORE | EVENT_DISCOVER_AFTER | EVENT_DELETE_HOST_BEFORE | EVENT_DELETE_HOST_AFTER | EVENT_CANCEL_MAINTENANCE_BEFORE | EVENT_CANCEL_MAINTENANCE_AFTER | EVENT_PREPARE_MAINTENANCE_BEFORE | EVENT_PREPARE_MAINTENANCE_AFTER); - - String getName(); /** * diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 54384f3bf4b..0897f4323cd 100644 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -129,7 +129,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma } if (lst.contains(listener)) { - throw new CloudRuntimeException("Duplicate resource lisener:" + listener.getName()); + throw new CloudRuntimeException("Duplicate resource lisener:" + listener.getClass().getSimpleName()); } lst.add(listener); @@ -213,7 +213,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma } else { throw new CloudRuntimeException("Unknown resource event:" + event); } - s_logger.debug("Sent resource event " + eventName + " to listener " + l.getName()); + s_logger.debug("Sent resource event " + eventName + " to listener " + l.getClass().getSimpleName()); } } }