Author: hadrian
Date: Mon Apr 2 19:13:59 2012
New Revision: 1308474
URL: http://svn.apache.org/viewvc?rev=1308474&view=rev
Log:
Merged revisions 1301644 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1301644 | davsclaus | 2012-03-16 12:49:12 -0400 (Fri, 16 Mar 2012) | 1 line
Polished
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.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/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=1308474&r1=1308473&r2=1308474&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
Mon Apr 2 19:13:59 2012
@@ -65,13 +65,7 @@ public class ManagedCamelContext impleme
}
public String getState() {
- // must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
- ServiceStatus status = context.getStatus();
- // if no status exists then its stopped
- if (status == null) {
- status = ServiceStatus.Stopped;
- }
- return status.name();
+ return context.getStatus().name();
}
public String getUptime() {
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java?rev=1308474&r1=1308473&r2=1308474&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
Mon Apr 2 19:13:59 2012
@@ -53,10 +53,6 @@ public class ManagedComponent implements
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
if (component instanceof StatefulService) {
ServiceStatus status = ((StatefulService) component).getStatus();
- // if no status exists then its stopped
- if (status == null) {
- status = ServiceStatus.Stopped;
- }
return status.name();
}
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java?rev=1308474&r1=1308473&r2=1308474&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
Mon Apr 2 19:13:59 2012
@@ -56,10 +56,6 @@ public class ManagedEndpoint implements
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
if (endpoint instanceof StatefulService) {
ServiceStatus status = ((StatefulService) endpoint).getStatus();
- // if no status exists then its stopped
- if (status == null) {
- status = ServiceStatus.Stopped;
- }
return status.name();
}
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java?rev=1308474&r1=1308473&r2=1308474&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
Mon Apr 2 19:13:59 2012
@@ -74,10 +74,6 @@ public class ManagedProcessor extends Ma
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
if (processor instanceof StatefulService) {
ServiceStatus status = ((StatefulService) processor).getStatus();
- // if no status exists then its stopped
- if (status == null) {
- status = ServiceStatus.Stopped;
- }
return status.name();
}
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java?rev=1308474&r1=1308473&r2=1308474&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java
Mon Apr 2 19:13:59 2012
@@ -62,10 +62,6 @@ public class ManagedService implements M
// must use String type to be sure remote JMX can read the attribute
without requiring Camel classes.
if (service instanceof StatefulService) {
ServiceStatus status = ((StatefulService) service).getStatus();
- // if no status exists then its stopped
- if (status == null) {
- status = ServiceStatus.Stopped;
- }
return status.name();
}