Author: davsclaus
Date: Sun Dec 19 11:09:06 2010
New Revision: 1050810

URL: http://svn.apache.org/viewvc?rev=1050810&view=rev
Log:
Improved javadoc on getEndpoint on from/to defintion as they may return null.

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

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java?rev=1050810&r1=1050809&r2=1050810&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java 
Sun Dec 19 11:09:06 2010
@@ -63,7 +63,6 @@ public class FromDefinition extends Opti
         return "from";
     }
 
-
     public String getLabel() {
         return description(getUri(), getRef(), getEndpoint());
     }
@@ -74,7 +73,6 @@ public class FromDefinition extends Opti
         } else {
             return endpoint;
         }
-        
     }
 
     // Properties
@@ -90,8 +88,8 @@ public class FromDefinition extends Opti
      */
     @Required
     public void setUri(String uri) {
-        this.uri = uri;
         clear();
+        this.uri = uri;
     }
 
     public String getRef() {
@@ -105,10 +103,18 @@ public class FromDefinition extends Opti
      * @param ref the reference name to use
      */
     public void setRef(String ref) {
-        this.ref = ref;
         clear();
+        this.ref = ref;
     }
 
+    /**
+     * Gets tne endpoint if an {...@link Endpoint} instance was set.
+     * <p/>
+     * This implementation may return <tt>null</tt> which means you need to use
+     * {...@link #getRef()} or {...@link #getUri()} to get information about 
the endpoint.
+     *
+     * @return the endpoint instance, or <tt>null</tt>
+     */
     public Endpoint getEndpoint() {
         return endpoint;
     }
@@ -145,6 +151,8 @@ public class FromDefinition extends Opti
 
     protected void clear() {
         this.endpoint = null;
+        this.ref = null;
+        this.uri = null;
     }
 
 }

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java?rev=1050810&r1=1050809&r2=1050810&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java 
Sun Dec 19 11:09:06 2010
@@ -86,6 +86,14 @@ public abstract class SendDefinition<Typ
         this.uri = uri;
     }
 
+    /**
+     * Gets tne endpoint if an {...@link Endpoint} instance was set.
+     * <p/>
+     * This implementation may return <tt>null</tt> which means you need to use
+     * {...@link #getRef()} or {...@link #getUri()} to get information about 
the endpoint.
+     *
+     * @return the endpoint instance, or <tt>null</tt>
+     */
     public Endpoint getEndpoint() {
         return endpoint;
     }


Reply via email to