Author: ningjiang
Date: Mon Jun 4 07:59:41 2007
New Revision: 544159
URL: http://svn.apache.org/viewvc?view=rev&rev=544159
Log:
CXF-659 & upgrade the easymockclassextension
Modified:
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
Modified: incubator/cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=diff&rev=544159&r1=544158&r2=544159
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Mon Jun 4 07:59:41 2007
@@ -596,7 +596,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>asm</groupId>
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?view=diff&rev=544159&r1=544158&r2=544159
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
Mon Jun 4 07:59:41 2007
@@ -89,13 +89,15 @@
destination = destinationFactory.getDestination(ei);
serverRegistry = bus.getExtension(ServerRegistry.class);
- InstrumentationManager manager =
bus.getExtension(InstrumentationManager.class);
- if (manager != null) {
- ManagedEndpoint mep = new ManagedEndpoint(bus, endpoint, this);
- mgr = bus.getExtension(ServerLifeCycleManager.class);
- if (mgr != null) {
- mgr.registerListener(mep);
- }
+
+ ManagedEndpoint mep = new ManagedEndpoint(bus, endpoint, this);
+ mgr = bus.getExtension(ServerLifeCycleManager.class);
+ if (mgr != null) {
+ mgr.registerListener(mep);
+ }
+
+ InstrumentationManager manager =
bus.getExtension(InstrumentationManager.class);
+ if (manager != null) {
try {
manager.register(mep);
} catch (JMException jmex) {
