svn commit: r1367103 - /openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java

[rmannibucau]

Author: rmannibucau
Date: Mon Jul 30 14:25:52 2012
New Revision: 1367103

URL: http://svn.apache.org/viewvc?rev=1367103&view=rev
Log:
OPENEJB-1879 new OWBInjector API

Modified:
    
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java

Modified: 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java?rev=1367103&r1=1367102&r2=1367103&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
 Mon Jul 30 14:25:52 2012
@@ -184,7 +184,7 @@ public class OpenEJBPerRequestPojoResour
     private class DefaultBeanCreator implements BeanCreator {
         private Message m;
         private InjectionProcessor<?> injector;
-        private OWBInjector cdiInjector;
+        private CreationalContext creationalContext;
         private Object instance;
 
         public DefaultBeanCreator(Message m) {
@@ -200,9 +200,10 @@ public class OpenEJBPerRequestPojoResour
                 injector = new InjectionProcessor<Object>(instance, new 
ArrayList<Injection>(injections), InjectionProcessor.unwrap(context));
                 instance = injector.createInstance();
 
+                final BeanManager bm = webbeansContext.getBeanManagerImpl();
+                creationalContext = bm.createCreationalContext(null);
                 try {
-                    cdiInjector = new OWBInjector(webbeansContext);
-                    cdiInjector.inject(instance);
+                    OWBInjector.inject(bm, instance, creationalContext);
                 } catch (Exception e) {
                     // ignored
                 }
@@ -237,8 +238,8 @@ public class OpenEJBPerRequestPojoResour
                 if (injector != null) {
                     injector.preDestroy();
                 }
-                if (cdiInjector != null) {
-                    cdiInjector.destroy();
+                if (creationalContext != null) {
+                    creationalContext.release();
                 }
             }
         }