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
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/componentmanager/ReferenceManager.java (file contents):
Revision 1.9 by tdb, Thu Jan 18 23:01:50 2001 UTC vs.
Revision 1.17 by tdb, Sat May 18 18:16:01 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * Copyright (C) 2000-2002 i-scream
4 + *
5 + * This program is free software; you can redistribute it and/or
6 + * modify it under the terms of the GNU General Public License
7 + * as published by the Free Software Foundation; either version 2
8 + * of the License, or (at your option) any later version.
9 + *
10 + * This program is distributed in the hope that it will be useful,
11 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13 + * GNU General Public License for more details.
14 + *
15 + * You should have received a copy of the GNU General Public License
16 + * along with this program; if not, write to the Free Software
17 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18 + */
19 +
20   //---PACKAGE DECLARATION---
21 < package uk.ac.ukc.iscream.componentmanager;
21 > package uk.org.iscream.cms.server.componentmanager;
22  
23   //---IMPORTS---
24   import org.omg.CORBA.ORB;
25   import org.omg.CosNaming.*;
26   import org.omg.PortableServer.*;
27 < import uk.ac.ukc.iscream.core.*;
27 > import uk.org.iscream.cms.server.core.*;
28 > import uk.org.iscream.cms.server.util.*;
29  
30   /**
31   * This class returns references for global system objects.
# Line 41 | Line 61 | public class ReferenceManager {
61       *
62       * @return a reference to the ReferenceManager
63       */
64 <    public static ReferenceManager getInstance() {
64 >    public synchronized static ReferenceManager getInstance() {
65          if (_instance == null) {
66              _instance = new ReferenceManager();
67          }
# Line 80 | Line 100 | public class ReferenceManager {
100              dieWithError("\nCRITICAL:Invalid Name - when resolving reference to " + name + "!\n" +
101                                "         Please check with your CORBA naming service provider.");
102          } catch (org.omg.CosNaming.NamingContextPackage.NotFound e) {
103 <            dieWithError("\nCRITICAL:Not Found - when resolving reference to " + name + "!\n" +
103 >            recoverWithError("\nCRITICAL:Not Found - when resolving reference to " + name + "!\n" +
104                                "         Please check that this component is running.");
105          }
106          return objRef;
# Line 110 | Line 130 | public class ReferenceManager {
130              dieWithError("\nCRITICAL:Naming Service Cannot Proceed - when binding " + name + "!\n" +
131                                "         Please check with your CORBA naming service provider.");
132          } catch (org.omg.CosNaming.NamingContextPackage.NotFound e) {
133 <            dieWithError("\nCRITICAL:Naming Service Not Found - when binding " + name + "!\n" +
133 >            recoverWithError("\nCRITICAL:Naming Service Not Found - when binding " + name + "!\n" +
134                                "         Please check with your CORBA naming service provider.");
135          } catch (org.omg.CosNaming.NamingContextPackage.AlreadyBound e) {
136              dieWithError("\nCRITICAL:Already Bound - when binding " + name + "!\n" +
# Line 135 | Line 155 | public class ReferenceManager {
155       * Overrides the {@link java.lang.Object#toString() Object.toString()}
156       * method to provide clean logging (every class should have this).
157       *
158 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
158 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
159       * to format the toString()
160       *
161       * @return the name of this class and its CVS revision
# Line 153 | Line 173 | public class ReferenceManager {
173       * If there are any CORBA errors this method is called with the
174       * error message.
175       *
176 +     * The exception this throws is generic to CORBA communication
177 +     * problems, this is a Runtime exception and is typically only
178 +     * explicitly caught in the ComponentManager for the current VM
179 +     * The ComponentManager can then decide what course of action to
180 +     * take.
181 +     *
182 +     * Also, if it can, it will log the message with the logger.
183 +     *
184 +     * @param message the error message to die with
185 +     */
186 +    private void recoverWithError(String message) throws ComponentCORBAException {
187 +        if (_logger != null) {
188 +            _logger.write(toString(), Logger.WARNING, "component CORBA error - " + message);
189 +        }
190 +        throw new ComponentCORBAException(message);
191 +    }
192 +
193 +
194 +    /**
195 +     * If there are any CORBA errors this method is called with the
196 +     * error message.
197 +     *
198       * Currently this prints the error, on the local err stream.  Will
199       * print to the logger if one is available.
200       *
# Line 170 | Line 212 | public class ReferenceManager {
212          System.exit(1);
213      }
214  
215 +
216 +
217   //---ACCESSOR/MUTATOR METHODS---
218  
219      /**
# Line 300 | Line 344 | public class ReferenceManager {
344      /**
345       * A reference to the single instance of this class
346       */
347 <    private static ReferenceManager _instance;
347 >    private static ReferenceManager _instance = null;
348   }

Diff Legend

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