Index: ./com/sun/enterprise/server/ondemand/OnDemandServer.java
===================================================================
RCS file: /cvs/glassfish/appserv-core/src/java/com/sun/enterprise/server/ondemand/OnDemandServer.java,v
retrieving revision 1.5
diff -u -r1.5 OnDemandServer.java
--- ./com/sun/enterprise/server/ondemand/OnDemandServer.java	3 Apr 2007 00:43:35 -0000	1.5
+++ ./com/sun/enterprise/server/ondemand/OnDemandServer.java	16 Apr 2007 23:36:22 -0000
@@ -76,6 +76,9 @@
             onDemandStartup = lazyStartupKernel.startASSocketServices(context) ;
         } catch (Exception e) {
             onDemandStartup = false;
+            e.printStackTrace();
+
+            
             // Quick startup is not enabled. Start with normal sequence.
         }
         //ORB is initialized lazily. If this variable is not set, 
@@ -130,7 +133,8 @@
         final String[][]    defaultServices )
             throws ServerLifecycleException {
         if (onDemandStartup) {
-            final InternalServicesList services = new TomcatServices();
+            //final InternalServicesList services = new TomcatServices();
+            InternalServicesList services = serverContext.getPluggableFeatureFactory().getInternalServicesList();
             final InternalServicesList ondemandservices = new OnDemandServices();
             final String[][] servicesByName = services.getServicesByName();
             final String[][] odsByName = ondemandservices.getServicesByName();