cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r997898 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/spring/ rt/core/src/test/java/org/apache/cxf/bus/spring/
Date Thu, 16 Sep 2010 19:55:26 GMT
Author: dkulp
Date: Thu Sep 16 19:55:26 2010
New Revision: 997898

URL: http://svn.apache.org/viewvc?rev=997898&view=rev
Log:
Merged revisions 997892 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r997892 | dkulp | 2010-09-16 15:45:52 -0400 (Thu, 16 Sep 2010) | 2 lines
  
  [CXF-2995] Patch use of cxf with lazy inits.
  Patch from Adam Lewandowski applied
........

Added:
    cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml
      - copied unchanged from r997892, cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/lazyInitBus.xml
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
    cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=997898&r1=997897&r2=997898&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
Thu Sep 16 19:55:26 2010
@@ -56,6 +56,7 @@ public class BusDefinitionParser extends
             bean.addConstructorArgReference(bus);
             element.removeAttribute("bus");
         }
+        bean.setLazyInit(false);
         super.doParse(element, ctx, bean);
     }
     

Modified: cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java?rev=997898&r1=997897&r2=997898&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
Thu Sep 16 19:55:26 2010
@@ -84,7 +84,22 @@ public class BusDefinitionParserTest ext
             }
         }
     }
-    
+
+    @Test
+    public void testLazyInit() {
+        String cfgFile = "org/apache/cxf/bus/spring/lazyInitBus.xml";
+        Bus bus = new SpringBusFactory().createBus(cfgFile, true);
+
+        List<Interceptor<? extends Message>> in = bus.getInInterceptors();
+        boolean found = false;
+        for (Interceptor i : in) {
+            if (i instanceof LoggingInInterceptor) {
+                found = true;
+            }
+        }
+        assertTrue("could not find logging interceptor.", found);
+    }
+
     static class TestBean {
 
         boolean initialised;



Mime
View raw message