You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by cz...@apache.org on 2003/01/08 13:13:54 UTC
cvs commit: jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl SourceResolverImpl.java
cziegeler 2003/01/08 04:13:53
Modified: sourceresolve/src/java/org/apache/excalibur/source/impl
SourceResolverImpl.java
Log:
Avoid extra isSelectable test
I couldn't compile it, so hopefully everything is ok...
Revision Changes Path
1.18 +27 -31 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SourceResolverImpl.java 15 Dec 2002 11:56:48 -0000 1.17
+++ SourceResolverImpl.java 8 Jan 2003 12:13:53 -0000 1.18
@@ -302,22 +302,20 @@
if( protocolPos != -1 )
{
final String protocol = systemID.substring( 0, protocolPos );
- if( m_factorySelector.isSelectable( protocol ) )
+ SourceFactory factory = null;
+ try
{
- SourceFactory factory = null;
- try
- {
- factory = (SourceFactory)m_factorySelector.select( protocol );
- source = factory.getSource( systemID, parameters );
- }
- catch( final ServiceException ce )
- {
- throw new SourceException( "Unable to select source factory for protocol " + protocol, ce );
- }
- finally
- {
- m_factorySelector.release( factory );
- }
+ factory = (SourceFactory)m_factorySelector.select( protocol );
+ source = factory.getSource( systemID, parameters );
+ }
+ catch( final ServiceException ce )
+ {
+ // no selector available, use fallback
+ //throw new SourceException( "Unable to select source factory for protocol " + protocol, ce );
+ }
+ finally
+ {
+ m_factorySelector.release( factory );
}
}
@@ -381,22 +379,20 @@
// search for a SourceFactory implementing the protocol
final String protocol = source.getProtocol();
- if( m_factorySelector.isSelectable( protocol ) )
+ SourceFactory factory = null;
+ try
{
- SourceFactory factory = null;
- try
- {
- factory = (SourceFactory)m_factorySelector.select( protocol );
- factory.release( source );
- }
- catch( final ServiceException ce )
- {
- throw new CascadingRuntimeException( "Unable to select source factory for protocol " + protocol, ce );
- }
- finally
- {
- m_factorySelector.release( factory );
- }
+ factory = (SourceFactory)m_factorySelector.select( protocol );
+ factory.release( source );
+ }
+ catch( final ServiceException ce )
+ {
+ //no factory available, so use fallback
+ //throw new CascadingRuntimeException( "Unable to select source factory for protocol " + protocol, ce );
+ }
+ finally
+ {
+ m_factorySelector.release( factory );
}
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>