mcconnell 2004/01/08 01:42:58
Modified:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: Ver_3_4 DefaultAppliance.java
Log:
Trial support for declaration on a non-proxied service.
Revision Changes Path
No revision
No revision
1.15.2.4 +8 -1
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -r1.15.2.3 -r1.15.2.4
--- DefaultAppliance.java 7 Jan 2004 20:34:42 -0000 1.15.2.3
+++ DefaultAppliance.java 8 Jan 2004 09:42:58 -0000 1.15.2.4
@@ -999,6 +999,13 @@
private Object createProvider( Object instance ) throws ApplianceException
{
+ if( getDeploymentModel().
+ getType().getInfo().
+ getAttribute( "urn:merlin:proxy", "true" ).equals( "false" ) )
+ {
+ return instance;
+ }
+
Class[] classes = m_model.getInterfaces();
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
