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.8 by ajm, Wed Dec 13 13:42:50 2000 UTC vs.
Revision 1.21 by tdb, Sun Aug 1 10:40:50 2004 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org
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.util;
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.*;
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 41 | 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 80 | Line 101 | public class ReferenceManager {
101              dieWithError("\nCRITICAL:Invalid Name - when resolving reference to " + name + "!\n" +
102                                "         Please check with your CORBA naming service provider.");
103          } catch (org.omg.CosNaming.NamingContextPackage.NotFound e) {
104 <            dieWithError("\nCRITICAL:Not Found - when resolving reference to " + name + "!\n" +
104 >            recoverWithError("\nCRITICAL:Not Found - when resolving reference to " + name + "!\n" +
105                                "         Please check that this component is running.");
106          }
107          return objRef;
# Line 110 | Line 131 | public class ReferenceManager {
131              dieWithError("\nCRITICAL:Naming Service Cannot Proceed - when binding " + name + "!\n" +
132                                "         Please check with your CORBA naming service provider.");
133          } catch (org.omg.CosNaming.NamingContextPackage.NotFound e) {
134 <            dieWithError("\nCRITICAL:Naming Service Not Found - when binding " + name + "!\n" +
134 >            recoverWithError("\nCRITICAL:Naming Service Not Found - when binding " + name + "!\n" +
135                                "         Please check with your CORBA naming service provider.");
136          } catch (org.omg.CosNaming.NamingContextPackage.AlreadyBound e) {
137              dieWithError("\nCRITICAL:Already Bound - when binding " + name + "!\n" +
# Line 135 | 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 153 | Line 174 | public class ReferenceManager {
174       * If there are any CORBA errors this method is called with the
175       * error message.
176       *
177 +     * The exception this throws is generic to CORBA communication
178 +     * problems, this is a Runtime exception and is typically only
179 +     * explicitly caught in the ComponentManager for the current VM
180 +     * The ComponentManager can then decide what course of action to
181 +     * take.
182 +     *
183 +     * Also, if it can, it will log the message with the logger.
184 +     *
185 +     * @param message the error message to die with
186 +     */
187 +    private void recoverWithError(String message) throws ComponentCORBAException {
188 +        if (_logger != null) {
189 +            _logger.write(toString(), Logger.WARNING, "component CORBA error - " + message);
190 +        }
191 +        throw new ComponentCORBAException(message);
192 +    }
193 +
194 +
195 +    /**
196 +     * If there are any CORBA errors this method is called with the
197 +     * error message.
198 +     *
199       * Currently this prints the error, on the local err stream.  Will
200       * print to the logger if one is available.
201       *
# Line 170 | Line 213 | public class ReferenceManager {
213          System.exit(1);
214      }
215  
216 +
217 +
218   //---ACCESSOR/MUTATOR METHODS---
219  
220      /**
# Line 215 | 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 300 | 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