You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/02/10 05:57:37 UTC
svn commit: r1242672 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/CamelContext.java
camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
Author: hadrian
Date: Fri Feb 10 04:57:37 2012
New Revision: 1242672
URL: http://svn.apache.org/viewvc?rev=1242672&view=rev
Log:
Merged revisions 1240376 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1240376 | bvahdat | 2012-02-03 17:32:08 -0500 (Fri, 03 Feb 2012) | 1 line
Corrected CamelContext.removeEndpoints() Javadoc & it's API usage by ManagedCamelContext.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/CamelContext.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=1242672&r1=1242671&r2=1242672&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/CamelContext.java Fri Feb 10 04:57:37 2012
@@ -298,7 +298,7 @@ public interface CamelContext extends Su
* Removes all endpoints with the given URI.
*
* @param pattern an uri or pattern to match
- * @return a collection of endpoints removed or null if there are no endpoints for this URI
+ * @return a collection of endpoints removed which could be empty if there are no endpoints found for the given <tt>pattern</tt>
* @throws Exception if at least one endpoint could not be stopped
* @see org.apache.camel.util.EndpointHelper#matchEndpoint(String, String) for pattern
*/
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=1242672&r1=1242671&r2=1242672&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java Fri Feb 10 04:57:37 2012
@@ -259,11 +259,7 @@ public class ManagedCamelContext impleme
public int removeEndpoints(String pattern) throws Exception {
// endpoints is always removed from JMX if removed from context
Collection<Endpoint> removed = context.removeEndpoints(pattern);
- if (removed == null) {
- return 0;
- } else {
- return removed.size();
- }
+ return removed.size();
}
}