svn commit: r1070457 - /camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java

[davsclaus]

Author: davsclaus
Date: Mon Feb 14 12:10:27 2011
New Revision: 1070457

URL: http://svn.apache.org/viewvc?rev=1070457&view=rev
Log:
CAMEL-3664: Fixed NPE in toString

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java?rev=1070457&r1=1070456&r2=1070457&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
 Mon Feb 14 12:10:27 2011
@@ -39,13 +39,13 @@ public class SamplingDefinition extends 
 
     // use Long to let it be optional in JAXB so when using XML the default is 
1 second
     
-    @XmlAttribute()
+    @XmlAttribute
     private Long samplePeriod;
 
-    @XmlAttribute()
+    @XmlAttribute
     private Long messageFrequency;
 
-    @XmlAttribute()
+    @XmlAttribute
     @XmlJavaTypeAdapter(TimeUnitAdapter.class)
     private TimeUnit units;
 
@@ -66,7 +66,8 @@ public class SamplingDefinition extends 
         if (messageFrequency != null) {
             return "Sample[1 Exchange per " + getMessageFrequency() + " 
messages received -> " + getOutputs() + "]";
         } else {
-            return "Sample[1 Exchange per " + getSamplePeriod() + " " + 
getUnits().toString().toLowerCase() + " -> " + getOutputs() + "]";
+            TimeUnit tu = getUnits() != null ? getUnits() : TimeUnit.SECONDS;
+            return "Sample[1 Exchange per " + getSamplePeriod() + " " + 
tu.toString().toLowerCase() + " -> " + getOutputs() + "]";
         }
     }
 
@@ -80,7 +81,8 @@ public class SamplingDefinition extends 
         if (messageFrequency != null) {
             return "sample[1 Exchange per " + getMessageFrequency() + " 
messages received]";
         } else {
-            return "sample[1 Exchange per " + getSamplePeriod() + " " + 
getUnits().toString().toLowerCase() + "]";
+            TimeUnit tu = getUnits() != null ? getUnits() : TimeUnit.SECONDS;
+            return "sample[1 Exchange per " + getSamplePeriod() + " " + 
tu.name().toLowerCase() + "]";
         }
     }