cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-7230] Trying to get the bus if it is null in ServiceListGeneratorServlet
Date Wed, 25 Jan 2017 15:17:07 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 9f39272a5 -> f5f64b884


[CXF-7230] Trying to get the bus if it is null in ServiceListGeneratorServlet


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f5f64b88
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f5f64b88
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f5f64b88

Branch: refs/heads/master
Commit: f5f64b88413ac38eb20210e5b1b529a79d401e1f
Parents: 9f39272
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Jan 25 15:16:49 2017 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Jan 25 15:16:49 2017 +0000

----------------------------------------------------------------------
 .../servlet/servicelist/FormattedServiceListWriter.java         | 4 ----
 .../servlet/servicelist/ServiceListGeneratorServlet.java        | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f5f64b88/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
index 67241b4..1496ff8 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
@@ -24,7 +24,6 @@ import java.net.URI;
 import java.util.Map;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.util.PropertyUtils;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.service.model.OperationInfo;
@@ -45,9 +44,6 @@ public class FormattedServiceListWriter implements ServiceListWriter {
         this.title = title;
         this.showForeignContexts = showForeignContexts;
         this.bus = bus;
-        if (this.bus == null) {
-            this.bus = BusFactory.getDefaultBus(false);
-        }
         if (this.bus != null) {
             this.atomMap = 
                 CastUtils.cast((Map<?, ?>)this.bus.getProperty("org.apache.cxf.extensions.logging.atom.pull"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/f5f64b88/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
index 27f14e7..8d24646 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListGeneratorServlet.java
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.message.Message;
@@ -49,6 +50,10 @@ public class ServiceListGeneratorServlet extends HttpServlet {
     public ServiceListGeneratorServlet(DestinationRegistry destinationRegistry, Bus bus)
{
         this.destinationRegistry = destinationRegistry;
         this.bus = bus;
+        if (this.bus == null) {
+            this.bus = BusFactory.getDefaultBus(false);
+        }
+        
         this.title = "CXF - Service list";
     }
 


Mime
View raw message