svn commit: r1500300 - /tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java

[rmannibucau]

Author: rmannibucau
Date: Sat Jul  6 15:58:27 2013
New Revision: 1500300

URL: http://svn.apache.org/r1500300
Log:
TOMEE-992 serializer option shouldn't be resetted by ejbds or httpejbd services

Modified:
    
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java

Modified: 
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?rev=1500300&r1=1500299&r2=1500300&view=diff
==============================================================================
--- 
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
 (original)
+++ 
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
 Sat Jul  6 15:58:27 2013
@@ -98,7 +98,7 @@ public class EjbDaemon implements org.ap
             } catch (final NoClassDefFoundError cnfe) { // let's try later 
with app classloader
                 this.serializer = new ContextualSerializer(serializer);
             }
-        } else {
+        } else if (!"ejbds".equals(props.getProperty("name", "ejbds")) && 
!"httpejbd".equals(props.getProperty("name", "ejbd"))) {
             this.serializer = null;
         }