You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/10/25 12:51:44 UTC
svn commit: r1402095 - in /cxf/trunk/rt:
core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
Author: coheigea
Date: Thu Oct 25 10:51:43 2012
New Revision: 1402095
URL: http://svn.apache.org/viewvc?rev=1402095&view=rev
Log:
More minor cleanups
Modified:
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=1402095&r1=1402094&r2=1402095&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java Thu Oct 25 10:51:43 2012
@@ -107,21 +107,16 @@ public class ExtensionManagerBus extends
setState(BusState.INITIAL);
-
- DestinationFactoryManager dfm = this.getExtension(DestinationFactoryManager.class);
- if (null == dfm) {
- dfm = new DestinationFactoryManagerImpl(this);
+ if (null == this.getExtension(DestinationFactoryManager.class)) {
+ new DestinationFactoryManagerImpl(this);
}
- ConduitInitiatorManager cfm = this.getExtension(ConduitInitiatorManager.class);
- if (null == cfm) {
- cfm = new ConduitInitiatorManagerImpl(this);
+ if (null == this.getExtension(ConduitInitiatorManager.class)) {
+ new ConduitInitiatorManagerImpl(this);
}
- BindingFactoryManager bfm = this.getExtension(BindingFactoryManager.class);
- if (null == bfm) {
- bfm = new BindingFactoryManagerImpl(this);
- extensions.put(BindingFactoryManager.class, bfm);
+ if (null == this.getExtension(BindingFactoryManager.class)) {
+ new BindingFactoryManagerImpl(this);
}
extensionManager.load(new String[] {
ExtensionManagerImpl.BUS_EXTENSION_RESOURCE,
Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=1402095&r1=1402094&r2=1402095&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java Thu Oct 25 10:51:43 2012
@@ -217,7 +217,7 @@ public class JettyHTTPServerEngineFactor
}
JettyHTTPServerEngine ref = retrieveJettyHTTPServerEngine(port);
if (null == ref) {
- ref = getOrCreate(this, host, port, tlsParams);
+ getOrCreate(this, host, port, tlsParams);
} else {
if (ref.getConnector() != null && ref.getConnector().isRunning()) {
throw new IOException("can't set the TLS params on the opened connector");