bloritsch 2003/01/16 13:27:05
Modified: sourceresolve/src/java/org/apache/excalibur/source/impl
SourceResolverImpl.java
Log:
hopefully fix the runtime classcast exception. A ServiceManager should never return
a ComponentSelector--it would return a ServiceSelector if anything.
Revision Changes Path
1.21 +6 -7
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/SourceResolverImpl.java
Index: SourceResolverImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/SourceResolverImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SourceResolverImpl.java 9 Jan 2003 09:37:20 -0000 1.20
+++ SourceResolverImpl.java 16 Jan 2003 21:27:05 -0000 1.21
@@ -61,8 +61,6 @@
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -72,6 +70,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.source.Source;
@@ -115,7 +114,7 @@
protected ServiceManager m_manager;
/** The special Source factories */
- protected ComponentSelector m_factorySelector;
+ protected ServiceSelector m_factorySelector;
/** The context */
protected Context m_context;
@@ -174,7 +173,7 @@
throws ServiceException
{
m_manager = manager;
- m_factorySelector = (ComponentSelector)m_manager.lookup( SourceFactory.ROLE
+ "Selector" );
+ m_factorySelector = (ServiceSelector)m_manager.lookup( SourceFactory.ROLE +
"Selector" );
}
public void dispose()
@@ -308,7 +307,7 @@
factory = (SourceFactory)m_factorySelector.select( protocol );
source = factory.getSource( systemID, parameters );
}
- catch( final ComponentException ce )
+ catch( final ServiceException ce )
{
// no selector available, use fallback
//throw new SourceException( "Unable to select source factory for
protocol " + protocol, ce );
@@ -385,7 +384,7 @@
factory = (SourceFactory)m_factorySelector.select( protocol );
factory.release( source );
}
- catch( ComponentException ce )
+ catch( ServiceException ce )
{
//no factory available, so use fallback
//throw new CascadingRuntimeException( "Unable to select source factory
for protocol " + protocol, ce );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
