mcconnell 2003/06/08 18:03:08
Modified: merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
BlockInvocationHandler.java
Log:
Fixed bug in behaviour when a block is simulating a component service provided by a
nested component.
Revision Changes Path
1.4 +6 -4
avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/BlockInvocationHandler.java
Index: BlockInvocationHandler.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/BlockInvocationHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BlockInvocationHandler.java 4 May 2003 17:21:05 -0000 1.3
+++ BlockInvocationHandler.java 9 Jun 2003 01:03:08 -0000 1.4
@@ -112,16 +112,18 @@
try
{
//
- // get the appliance we will delegate to
+ // get the appliance we delegate to
//
VirtualService service =
m_block.getVirtualService( method.getDeclaringClass() );
+
String path = service.getPath();
String base = m_block.getURL().getPath();
String source = base + path;
URL url = new URL( m_block.getURL(), source );
- Appliance provider = (Appliance) m_block.resolve( url.getPath() );
+ Appliance provider =
+ (Appliance) m_block.resolveAppliance( url.getPath() );
//
// resolve the service object from the appliance
@@ -146,7 +148,7 @@
final String error =
"Composite service resolution failure for the class: '"
+ method.getDeclaringClass()
- + "' on operation: '" + method.getName()
+ + "' for operation: '" + method.getName()
+ "' in appliance: " + m_block;
throw new BlockException( error, e );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
