You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2015/05/03 00:25:02 UTC

svn commit: r1677359 - in /openwebbeans/trunk: webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java webbeans-spi/src/main/java/org/apache/webbeans/spi/FailOverService.java

Author: struberg
Date: Sat May  2 22:25:01 2015
New Revision: 1677359

URL: http://svn.apache.org/r1677359
Log:
OWB-1049 remove FailOverService

This is not needed any longer as we store http backed session contextss 
directly in the HttpSession.

Removed:
    openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/FailOverService.java
Modified:
    openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java

Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java?rev=1677359&r1=1677358&r2=1677359&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java (original)
+++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java Sat May  2 22:25:01 2015
@@ -43,7 +43,6 @@ import org.apache.webbeans.config.OWBLog
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
-import org.apache.webbeans.spi.FailOverService;
 import org.apache.webbeans.spi.ResourceInjectionService;
 import org.apache.webbeans.spi.api.ResourceReference;
 import org.apache.webbeans.util.AnnotationUtil;
@@ -183,17 +182,6 @@ public class StandaloneResourceInjection
     @Override
     public <T> void writeExternal(Bean<T> bean, T actualResource, ObjectOutput out) throws IOException
     {
-        // try fail over service to serialize the resource object
-        FailOverService failoverService = webBeansContext.getService(FailOverService.class);
-        if (failoverService != null)
-        {
-            Object ret = failoverService.handleResource(bean, actualResource, null, out);
-            if (ret != FailOverService.NOT_HANDLED)
-            {
-                return;
-            }
-        }
-
         // default behavior
         if (actualResource instanceof Serializable)
         {
@@ -216,16 +204,6 @@ public class StandaloneResourceInjection
             ClassNotFoundException
     {
         T actualResource = null;
-        // try fail over service to serialize the resource object
-        FailOverService failoverService = webBeansContext.getService(FailOverService.class);
-        if (failoverService != null)
-        {
-            actualResource = (T) failoverService.handleResource(bean, actualResource, in, null);
-            if (actualResource != FailOverService.NOT_HANDLED)
-            {
-                return actualResource;
-            }
-        }
 
         // default behavior
         actualResource = (T) in.readObject();