modify the npe

cat-core/src/main/java/com/dianping/cat/service/ProjectService.java

@@ -51,8 +51,8 @@ public class ProjectService implements Initializable {
 	public boolean delete(Project project) {
 		int id = project.getId();
 		String domainName = null;
-		
-		for(Entry<String,Project> entry:m_domainToProjects.entrySet()){
+
+		for (Entry<String, Project> entry : m_domainToProjects.entrySet()) {
 			Project pro = entry.getValue();
 
 			if (pro.getId() == id) {
@@ -178,7 +178,12 @@ public class ProjectService implements Initializable {
 			for (Project project : projects) {
 				tmpDomains.add(project.getDomain());
 				tmpDomainProjects.put(project.getDomain(), project);
-				tmpCmdbProjects.put(project.getCmdbDomain(), project);
+
+				String cmdb = project.getCmdbDomain();
+
+				if (cmdb != null) {
+					tmpCmdbProjects.put(cmdb, project);
+				}
 			}
 			m_domains = tmpDomains;
 			m_domainToProjects = tmpDomainProjects;

cat-home/src/main/resources/META-INF/plexus/components.xml

@@ -5,8 +5,8 @@
 			<implementation>com.dianping.cat.config.content.DefaultContentFetcher</implementation>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.JsonBuilder</role>
-			<implementation>com.dianping.cat.report.page.JsonBuilder</implementation>
+			<role>com.dianping.cat.helper.JsonBuilder</role>
+			<implementation>com.dianping.cat.helper.JsonBuilder</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.report.graph.svg.ValueTranslater</role>
@@ -3280,7 +3280,7 @@
 					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.JsonBuilder</role>
+					<role>com.dianping.cat.helper.JsonBuilder</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -3358,8 +3358,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.JsonBuilder</role>
-			<implementation>com.dianping.cat.report.page.JsonBuilder</implementation>
+			<role>com.dianping.cat.helper.JsonBuilder</role>
+			<implementation>com.dianping.cat.helper.JsonBuilder</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.report.page.transaction.Handler</role>
@@ -3841,7 +3841,7 @@
 					<field-name>m_problemService</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.JsonBuilder</role>
+					<role>com.dianping.cat.helper.JsonBuilder</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -4411,7 +4411,7 @@
 			<implementation>com.dianping.cat.report.page.monitor.Handler</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.report.page.JsonBuilder</role>
+					<role>com.dianping.cat.helper.JsonBuilder</role>
 				</requirement>
 			</requirements>
 		</component>