mcconnell 2004/01/09 06:13:00
Modified:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
DefaultAppliance.java
Log:
Sync. with 3.2.3-bis and 3.4.
Revision Changes Path
1.16 +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
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultAppliance.java 22 Dec 2003 21:28:09 -0000 1.15
+++ DefaultAppliance.java 9 Jan 2004 14:13:00 -0000 1.16
@@ -1164,6 +1164,13 @@
private Object createProvider( Object instance ) throws ApplianceException
{
+ if( getComponentModel().
+ getType().getInfo().
+ getAttribute( "urn:activation: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]
