misc - null check

Author: gunlee01

scouter.client/src/scouter/client/util/MenuUtil.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 the original author or authors. 
+ *  Copyright 2015 the original author or authors. 
  *  @https://github.com/scouter-project/scouter
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
@@ -17,9 +17,6 @@
  */
 package scouter.client.util;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuCreator;
 import org.eclipse.jface.action.IMenuListener;
@@ -36,7 +33,6 @@
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
-
 import scouter.client.Images;
 import scouter.client.actions.OpenActiveServiceListAction;
 import scouter.client.actions.OpenActiveSpeedAction;
@@ -121,6 +117,9 @@
 import scouter.lang.counters.CounterEngine;
 import scouter.util.DateUtil;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 public class MenuUtil implements IMenuCreator{
 
 	private Menu menu;
@@ -215,6 +214,9 @@ public static void createMenu(IWorkbenchWindow window, IToolBarManager man,
 	public static HashMap<String, Action> getCounterActionList(IWorkbenchWindow window, CounterEngine counterEngine, int serverId){
 		HashMap<String, Action> actions = new HashMap<String, Action>();
 		ArrayList<String> objTypeAndCounter = counterEngine.getAllCounterList();
+		if (objTypeAndCounter == null || objTypeAndCounter.isEmpty()) {
+			return actions;
+		}
 		for (int inx = 0; inx < objTypeAndCounter.size(); inx++) {
 			String[] splitedKey = objTypeAndCounter.get(inx).split(":");
 			String objType = splitedKey[0];

scouter.common/src/main/java/scouter/lang/ObjectType.java

@@ -17,11 +17,11 @@
 
 package scouter.lang;
 
+import scouter.util.StringKeyLinkedMap;
+
 import java.util.Enumeration;
 import java.util.List;
 
-import scouter.util.StringKeyLinkedMap;
-
 public class ObjectType {
 	private String name;
 	private String displayName;
@@ -80,6 +80,7 @@ public boolean isTrueAttribute(String key) {
 	}
 
 	public Counter[] listCounters() {
+		if(family == null) return null;
 		List<Counter> list = family.listCounters();
 		Enumeration<Counter> en = counterMap.values();
 		while (en.hasMoreElements()) {
@@ -132,4 +133,4 @@ public boolean equals(Object obj) {
 			return false;
 		return true;
 	}
-}
+}

scouter.common/src/main/java/scouter/lang/counters/CounterEngine.java

@@ -277,6 +277,7 @@ public ArrayList<String> getAllCounterList() {
 		while (types.hasMoreElements()) {
 			ObjectType obj = types.nextElement();
 			scouter.lang.Counter[] counters = obj.listCounters();
+			if(counters == null) return null;
 			for (scouter.lang.Counter counter : counters) {
 				if (counter.isAll()) {
 					list.add(obj.getName() + ":" + counter.getDisplayName() + ":" + counter.getName());
@@ -542,4 +543,4 @@ public static void main(String[] args) {
 		System.out.println(ce.getCounterIconFileName("tomcat", "visit0"));
 		System.out.println(ce.getCounterUnit("tomcat", "visit0"));
 	}
-}
+}

scouter.server/src/main/java/scouter/server/plugin/alert/RealCounter.java

@@ -28,6 +28,7 @@
 import scouter.lang.value.Value;
 import scouter.server.core.AgentManager;
 import scouter.server.core.cache.CounterCache;
+import scouter.util.HashUtil;
 import scouter.util.IntLongLinkedMap;
 import scouter.util.LongEnumer;
 import scouter.util.LongKeyLinkedMap;
@@ -300,6 +301,17 @@ public float getFloatValue(String counter) {
 			return 0;
 	}
 
+	@ConfigDesc("get the another objects counter's value as float.")
+	@ParamDesc("String objectFullName, String counter")
+	public float getFloatValue(String objectFullName, String counter) {
+		int anotherObjHash = HashUtil.hash(objectFullName);
+		Value v = CounterCache.get(new CounterKey(anotherObjHash, counter, _timetype));
+		if (v instanceof Number)
+			return ((Number) v).floatValue();
+		else
+			return 0;
+	}
+
 	@Deprecated
 	public float floatValue(String counter) {
 		return getFloatValue(counter);
@@ -315,6 +327,17 @@ public int getIntValue(String counter) {
 			return 0;
 	}
 
+	@ConfigDesc("get the another objects counter's value as int.")
+	@ParamDesc("String objectFullName, String counter")
+	public int getIntValue(String objectFullName, String counter) {
+		int anotherObjHash = HashUtil.hash(objectFullName);
+		Value v = CounterCache.get(new CounterKey(anotherObjHash, counter, _timetype));
+		if (v instanceof Number)
+			return ((Number) v).intValue();
+		else
+			return 0;
+	}
+
 	@Deprecated
 	public int intValue(String counter) {
 		return getIntValue(counter);