Niclas, I've attached *and* pasted the patch with this message. Please tell
me whether you really don't get the attachment.
Daniel
============= Patch ========================
Index:
merlin/platform/tutorials/composition/application/impl/src/java/tutorial/app
lication/Application.java
===================================================================
RCS file:
/home/cvspublic/avalon/merlin/platform/tutorials/composition/application/imp
l/src/java/tutorial/application/Application.java,v
retrieving revision 1.3
diff -u -r1.3 Application.java
---
merlin/platform/tutorials/composition/application/impl/src/java/tutorial/app
lication/Application.java 24 Feb 2004 22:18:23 -0000 1.3
+++
merlin/platform/tutorials/composition/application/impl/src/java/tutorial/app
lication/Application.java 14 Mar 2004 14:32:29 -0000
@@ -52,33 +52,13 @@
{
getLogger().info( "servicing application" );
- LocationService locator = null;
- Object object = manager.lookup( "locator" );
- if( object instanceof LocationService )
- {
- locator = (LocationService) object;
- }
- else
- {
- final String error =
- "Object " + object.getClass().getName()
- + " does not implement the LocatorService class.";
- throw new ServiceException( "locator", error );
- }
-
- PublisherService publisher = null;
- object = manager.lookup( "publisher" );
- if( object instanceof PublisherService )
- {
- publisher = (PublisherService) object;
- }
- else
- {
- final String error =
- "Object " + object.getClass().getName()
- + " does not implement the PublisherService class.";
- throw new ServiceException( "publisher", error );
- }
+ //
+ // Not necessary to check with instanceof as casting at this moment
is
+ // save within Merlin
+ //
+
+ LocationService locator = (LocationService) object;
+ PublisherService publisher = (PublisherService) object;
//
// get the location from the locator and publish
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
