jstrachan 01/08/30 10:34:44
Modified: messenger/src/java/org/apache/commons/messenger
MessengerManager.java
Log:
Patched the manager construction code to make it a little cleaner
Revision Changes Path
1.3 +7 -7
jakarta-commons-sandbox/messenger/src/java/org/apache/commons/messenger/MessengerManager.java
Index: MessengerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/messenger/src/java/org/apache/commons/messenger/MessengerManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessengerManager.java 2001/08/29 08:58:35 1.2
+++ MessengerManager.java 2001/08/30 17:34:44 1.3
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
- * $Id: MessengerManager.java,v 1.2 2001/08/29 08:58:35 jstrachan Exp $
+ * $Id: MessengerManager.java,v 1.3 2001/08/30 17:34:44 jstrachan Exp $
*/
package org.apache.commons.messenger;
@@ -19,7 +19,7 @@
/** <p><code>MessengerManager</code> is a manager of {@link Messenger}
instances.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class MessengerManager {
@@ -90,17 +90,17 @@
return messengers.keySet().iterator();
}
- // Implementation methods
- //-------------------------------------------------------------------------
-
/** Returns the singleton MessengerManager */
- protected static synchronized MessengerManager getInstance() throws
JMSException {
+ public synchronized static MessengerManager getInstance() throws JMSException {
if ( singleton == null ) {
singleton = createInstance();
}
return singleton;
}
+ // Implementation methods
+ //-------------------------------------------------------------------------
+
/** Installs a new singleton MessengerManager instance */
protected static void setInstance(MessengerManager messengerManager) {
singleton = messengerManager;
@@ -115,7 +115,7 @@
catch (Exception e) {
}
if ( config != null ) {
- load( config );
+ return load( config );
}
URL url = MessengerManager.class.getClassLoader().getResource(
"Messenger.xml" );
if ( url != null ) {
