Hi Babak,
You don't have to revert the change.
It could be more easy by using "svnmerge.py block -rREVISION_NUMBER" to
block the version that you already merged.
On Tue Feb 7 23:49:57 2012, bvah...@apache.org wrote:
Author: bvahdat
Date: Tue Feb 7 15:49:57 2012
New Revision: 1241501
URL: http://svn.apache.org/viewvc?rev=1241501&view=rev
Log:
revert the previous commit which lacks the svn:merge info.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java?rev=1241501&r1=1241500&r2=1241501&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedPerformanceCounterMBean.java
Tue Feb 7 15:49:57 2012
@@ -21,7 +21,10 @@ import java.util.Date;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
-public interface ManagedPerformanceCounterMBean extends ManagedCounterMBean {
+public interface ManagedPerformanceCounterMBean {
+
+ @ManagedOperation(description = "Reset counters")
+ void reset();
@ManagedAttribute(description = "Number of completed exchanges")
long getExchangesCompleted() throws Exception;
--
Willem
----------------------------------
FuseSource
Web: http://www.fusesource.com
Blog: http://willemjiang.blogspot.com (English)
http://jnn.javaeye.com (Chinese)
Twitter: willemjiang
Weibo: willemjiang
