You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rm...@apache.org on 2013/07/29 16:08:03 UTC
svn commit: r1508076 -
/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/format/MapFormat.java
Author: rmannibucau
Date: Mon Jul 29 14:08:03 2013
New Revision: 1508076
URL: http://svn.apache.org/r1508076
Log:
fixing default unit
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/format/MapFormat.java
Modified: commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/format/MapFormat.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/format/MapFormat.java?rev=1508076&r1=1508075&r2=1508076&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/format/MapFormat.java (original)
+++ commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/format/MapFormat.java Mon Jul 29 14:08:03 2013
@@ -42,8 +42,22 @@ public class MapFormat {
protected static Unit timeUnit(final Map<String, ?> params) {
final Object u = params.get("unit");
- if (u != null && String.class.isInstance(u)) {
- return Unit.get(String.class.cast(u).toUpperCase());
+ if (u != null) {
+ if (String.class.isInstance(u)) {
+ final Unit unit = Unit.get(String.class.cast(u).toLowerCase());
+ if (unit != null) {
+ return unit;
+ }
+ }
+ if (String[].class.isInstance(u)) {
+ final String[] array = String[].class.cast(u);
+ if (array.length > 0) {
+ final Unit unit = Unit.get(array[0].toLowerCase());
+ if (unit != null) {
+ return unit;
+ }
+ }
+ }
}
return Unit.Time.MILLISECOND;
}