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:51:55 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e0d304a3b -> 19f69a87b


[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/19f69a87
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/19f69a87
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/19f69a87

Branch: refs/heads/3.0.x-fixes
Commit: 19f69a87bd870c80a86df812180a2d6075881af8
Parents: e0d304a
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:51:36 2017 +0000

----------------------------------------------------------------------
 .../servlet/servicelist/ServiceListGeneratorServlet.java        | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/19f69a87/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 3e19ccb..670c0fd 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
@@ -32,6 +32,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;
@@ -51,6 +52,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