svn commit: r1036382 - /camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java

[davsclaus]

Author: davsclaus
Date: Thu Nov 18 10:10:16 2010
New Revision: 1036382

URL: http://svn.apache.org/viewvc?rev=1036382&view=rev
Log:
Fixed potential NPE when getting the camel context name.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java?rev=1036382&r1=1036381&r2=1036382&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
 Thu Nov 18 10:10:16 2010
@@ -41,6 +41,9 @@ public class DefaultCamelContextNameStra
     }
 
     public String getName() {
+        if (name == null) {
+            name = getNextName();
+        }
         return name;
     }