ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/componentmanager/ReferenceManager.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/componentmanager/ReferenceManager.java (file contents):
Revision 1.12 by ajm, Fri Feb 23 16:55:12 2001 UTC vs.
Revision 1.20 by ajm, Mon Jul 14 16:05:54 2003 UTC

#	Line 1 | Line 1
1	+	/*
2	+	* i-scream central monitoring system
3	+	* http://www.i-scream.org.uk
4	+	* Copyright (C) 2000-2002 i-scream
5	+	*
6	+	* This program is free software; you can redistribute it and/or
7	+	* modify it under the terms of the GNU General Public License
8	+	* as published by the Free Software Foundation; either version 2
9	+	* of the License, or (at your option) any later version.
10	+	*
11	+	* This program is distributed in the hope that it will be useful,
12	+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	+	* GNU General Public License for more details.
15	+	*
16	+	* You should have received a copy of the GNU General Public License
17	+	* along with this program; if not, write to the Free Software
18	+	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19	+	*/
20	+
21		//---PACKAGE DECLARATION---
22	<	package uk.ac.ukc.iscream.componentmanager;
22	>	package uk.org.iscream.cms.server.componentmanager;
23
24		//---IMPORTS---
25		import org.omg.CORBA.ORB;
26		import org.omg.CosNaming.*;
27		import org.omg.PortableServer.*;
28	<	import uk.ac.ukc.iscream.core.*;
29	<	import uk.ac.ukc.iscream.util.*;
28	>	import uk.org.iscream.cms.server.core.*;
29	>	import uk.org.iscream.cms.util.*;
30
31		/**
32		* This class returns references for global system objects.
#	Line 42 | Line 62 | public class ReferenceManager {
62		*
63		* @return a reference to the ReferenceManager
64		*/
65	<	public static ReferenceManager getInstance() {
65	>	public synchronized static ReferenceManager getInstance() {
66		if (_instance == null) {
67		_instance = new ReferenceManager();
68		}
#	Line 136 | Line 156 | public class ReferenceManager {
156		* Overrides the {@link java.lang.Object#toString() Object.toString()}
157		* method to provide clean logging (every class should have this).
158		*
159	<	* This uses the uk.ac.ukc.iscream.util.NameFormat class
159	>	* This uses the uk.org.iscream.cms.util.NameFormat class
160		* to format the toString()
161		*
162		* @return the name of this class and its CVS revision
#	Line 240 | Line 260 | public class ReferenceManager {
260		} catch (org.omg.CORBA.ORBPackage.InvalidName e) {
261		dieWithError("\nCRITICAL:Unable to resolve reference to the Naming Service!\n" +
262		"         Please check with your CORBA naming service provider.");
263	+	} catch (java.lang.NullPointerException e) {
264	+	dieWithError("\nCRITICAL:Unable to resolve reference to the Naming Service!\n" +
265	+	"         Please check with your CORBA naming service provider.");
266		}
267		_ns = NamingContextExtHelper.narrow(objRef);
268		}
#	Line 325 | Line 348 | public class ReferenceManager {
348		/**
349		* A reference to the single instance of this class
350		*/
351	<	private static ReferenceManager _instance;
351	>	private static ReferenceManager _instance = null;
352		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines