[3/5] git commit: Avoid potential NPE

[da...@apache.org]

Avoid potential NPE


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c8a97676
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c8a97676
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c8a97676

Branch: refs/heads/camel-2.11.x
Commit: c8a9767620ad82738d72f6c9a0b1672bf1ab4855
Parents: e2b5add
Author: Claus Ibsen <da...@apache.org>
Authored: Sat May 25 08:35:16 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat May 25 08:36:01 2013 +0200

----------------------------------------------------------------------
 .../apache/camel/util/IntrospectionSupport.java    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c8a97676/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index f6be206..22bb389 100755
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -534,7 +534,7 @@ public final class IntrospectionSupport {
             // we did not find a setter method to use, and if we did try to use a type converter then throw
             // this kind of exception as the caused by will hint this error
             throw new IllegalArgumentException("Could not find a suitable setter for property: " + name
-                    + " as there isn't a setter method with same type: " + value.getClass().getCanonicalName()
+                    + " as there isn't a setter method with same type: " + (value != null ? value.getClass().getCanonicalName() : "[null]")
                     + " nor type conversion possible: " + typeConversionFailed.getMessage());
         } else {
             return false;