svn commit: r946705 - /openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java

[dblevins]

Author: dblevins
Date: Thu May 20 16:48:26 2010
New Revision: 946705

URL: http://svn.apache.org/viewvc?rev=946705&view=rev
Log:
One more part for OPENEJB-1249
Call the Server.stop() method on shutdown

Modified:
    
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java

Modified: 
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java?rev=946705&r1=946704&r2=946705&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
 (original)
+++ 
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
 Thu May 20 16:48:26 2010
@@ -21,9 +21,10 @@ import java.net.*;
 import java.util.*;
 
 import org.apache.openejb.server.ServerService;
-import org.apache.openejb.server.ServiceManager;
 import org.apache.openejb.server.ServiceException;
+import org.apache.openejb.server.Server;
 import org.apache.openejb.client.RequestMethodConstants;
+import org.apache.openejb.loader.SystemInstance;
 
 public class AdminDaemon implements ServerService {
 
@@ -32,11 +33,9 @@ public class AdminDaemon implements Serv
 
     public void service(Socket socket) throws ServiceException, IOException {
         InputStream in = null;
-        InetAddress clientIP = null;
 
         try {
             in = socket.getInputStream();
-            clientIP = socket.getInetAddress();
 
             byte requestType = (byte) in.read();
 
@@ -49,7 +48,8 @@ public class AdminDaemon implements Serv
                 case RequestMethodConstants.STOP_REQUEST_quit:
                 case RequestMethodConstants.STOP_REQUEST_Stop:
                 case RequestMethodConstants.STOP_REQUEST_stop:
-                    ServiceManager.getManager().stop();
+                    Server server = 
SystemInstance.get().getComponent(Server.class);
+                    server.stop();
 
             }