proyal 2002/07/17 13:45:00
Modified: fortress/src/java/org/apache/excalibur/fortress/util
ContextBuilder.java
Log:
Reversed logic to work as intended
Revision Changes Path
1.14 +6 -6
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
Index: ContextBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ContextBuilder.java 12 Jul 2002 12:53:45 -0000 1.13
+++ ContextBuilder.java 17 Jul 2002 20:45:00 -0000 1.14
@@ -93,13 +93,13 @@
try
{
context.get( SERVICE_MANAGER_PARENT );
+
+ throw new IllegalStateException( "ServiceManagerParent already
specified" );
}
catch ( ContextException e )
{
- throw new IllegalStateException( "ServiceManagerParent already
specified" );
+ context.put( COMPONENT_MANAGER_PARENT, componentManager );
}
-
- context.put( COMPONENT_MANAGER_PARENT, componentManager );
}
public void setComponentManager( ComponentManager componentManager )
@@ -112,13 +112,13 @@
try
{
context.get( COMPONENT_MANAGER_PARENT );
+
+ throw new IllegalStateException( "ComponentManagerParent already
specified" );
}
catch ( ContextException e )
{
- throw new IllegalStateException( "ComponentManagerParent already
specified" );
+ context.put( SERVICE_MANAGER_PARENT, serviceManager );
}
-
- context.put( SERVICE_MANAGER_PARENT, serviceManager );
}
public void setServiceManager( ServiceManager componentManager )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
