svn commit: r1593345 - /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

[rmannibucau]

Author: rmannibucau
Date: Thu May  8 17:38:01 2014
New Revision: 1593345

URL: http://svn.apache.org/r1593345
Log:
TOMEE-1201 config for a resource should be in the resource and default in 
global config

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1593345&r1=1593344&r2=1593345&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Thu May  8 17:38:01 2014
@@ -2182,7 +2182,7 @@ public class Assembler extends Assembler
                     .size(threadPoolSize)
                     .prefix(serviceInfo.id)
                     .threadFactory(new DaemonThreadFactory(serviceInfo.id + 
"-worker-"))
-                    .build(SystemInstance.get().getOptions());
+                    .build(new Options(serviceInfo.properties, 
SystemInstance.get().getOptions()));
                 logger.info("Thread pool size for '" + serviceInfo.id + "' is 
(" + threadPoolSize + ")");
             }