[openejb-scm] openejb/modules/core/src/java/org/openejb/server SimpleSocketService.java

[dain]

dain        2004/11/15 00:37:12

  Modified:    modules/core/src/java/org/openejb/server
                        SimpleSocketService.java
  Log:

  Fixed classloader handling
  
  Revision  Changes    Path
  1.9       +5 -4      
openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java
  
  Index: SimpleSocketService.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/SimpleSocketService.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SimpleSocketService.java  30 Oct 2004 05:18:28 -0000      1.8
  +++ SimpleSocketService.java  15 Nov 2004 05:37:12 -0000      1.9
  @@ -68,10 +68,10 @@
       private static final Log log = 
LogFactory.getLog(SimpleSocketService.class);
       private final ServerService server;
   
  -    public SimpleSocketService(String serviceClassName, InetAddress[] 
onlyFrom, ContainerIndex containerIndex) throws Exception {
  +    public SimpleSocketService(String serviceClassName, InetAddress[] 
onlyFrom, ContainerIndex containerIndex, ClassLoader cl) throws Exception {
           ServerService service;
   
  -        Class serviceClass = ClassLoading.loadClass(serviceClassName);
  +        Class serviceClass = ClassLoading.loadClass(serviceClassName, cl);
           if (!serviceClass.isAssignableFrom(serviceClass)) {
               throw new ServiceException("Server service class does not 
implement " + ServerService.class.getName() + ": " + serviceClassName);
           }
  @@ -124,13 +124,14 @@
   
           infoFactory.addAttribute("serviceClassName", String.class, true);
           infoFactory.addAttribute("onlyFrom", InetAddress[].class, true);
  +        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
           infoFactory.addAttribute("name", String.class, false);
   
           infoFactory.addReference("ContainerIndex", ContainerIndex.class);
   
           infoFactory.addInterface(SocketService.class);
   
  -        infoFactory.setConstructor(new String[]{"serviceClassName", 
"onlyFrom", "ContainerIndex"});
  +        infoFactory.setConstructor(new String[]{"serviceClassName", 
"onlyFrom", "ContainerIndex", "classLoader"});
   
           GBEAN_INFO = infoFactory.getBeanInfo();
       }