cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: [CXF-5579] Adding getBus(boolean createIfNeeded) to AbstractEndpointFactory
Date Wed, 26 Feb 2014 12:36:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 945912462 -> 5f5159ecf


[CXF-5579] Adding getBus(boolean createIfNeeded) to AbstractEndpointFactory

Conflicts:

	core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java


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

Branch: refs/heads/2.7.x-fixes
Commit: 5f5159ecf2b4c5ae3a70b04247fa1beebb93d3f5
Parents: 9459124
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Feb 26 12:03:01 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Feb 26 12:34:57 2014 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/endpoint/AbstractEndpointFactory.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5f5159ec/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java b/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
index 7c8b832..2868b0b 100644
--- a/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
+++ b/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
@@ -77,7 +77,11 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
     }
 
     public Bus getBus() {
-        if (bus == null) {
+        return getBus(true);
+    }
+
+    public Bus getBus(boolean createIfNeeded) {
+        if (bus == null && createIfNeeded) {
             bus = BusFactory.getThreadDefaultBus();
         }
         return bus;


Mime
View raw message