donaldp 01/02/28 00:28:36
Modified: src/java/org/apache/phoenix/engine
DefaultServerApplication.java
Log:
No longer necessary for a separate loadBlocks method.
Revision Changes Path
1.6 +6 -9
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java
Index: DefaultServerApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultServerApplication.java 2001/02/28 08:13:54 1.5
+++ DefaultServerApplication.java 2001/02/28 08:28:32 1.6
@@ -152,7 +152,12 @@
throws Exception
{
// load blocks
- try { loadBlocks(); }
+ try
+ {
+ getLogger().info( "Number of blocks to load: " +
m_entries.size() );
+ final Phase phase = (Phase)m_phases.get( "startup" );
+ runPhase( phase );
+ }
catch( final ApplicationException ae )
{
getLogger().warn( "Error loading blocks: " + ae.getMessage(), ae
);
@@ -359,14 +364,6 @@
throw new ContainerException( message );
}
}
- }
-
- protected void loadBlocks()
- throws Exception
- {
- getLogger().info( "Number of blocks to load: " + m_entries.size() );
- final Phase phase = (Phase)m_phases.get( "startup" );
- runPhase( phase );
}
/**
