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.18 by tdb, Tue May 21 16:47:17 2002 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.uk
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
# Line 26 | Line 26 | import org.omg.CORBA.ORB;
26   import org.omg.CosNaming.*;
27   import org.omg.PortableServer.*;
28   import uk.org.iscream.cms.server.core.*;
29 < import uk.org.iscream.cms.server.util.*;
29 > import uk.org.iscream.cms.util.*;
30  
31   /**
32   * This class returns references for global system objects.
# Line 156 | 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.org.iscream.cms.server.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 260 | 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          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines