ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationServant.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/core/ConfigurationServant.java (file contents):
Revision 1.16 by tdb, Tue Mar 13 19:05:22 2001 UTC vs.
Revision 1.20 by tdb, Tue May 29 17:02:34 2001 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.core;
2 > package uk.org.iscream.cms.server.core;
3  
4   //---IMPORTS---
5 < import uk.ac.ukc.iscream.util.*;
6 < import uk.ac.ukc.iscream.componentmanager.*;
5 > import uk.org.iscream.cms.server.util.*;
6 > import uk.org.iscream.cms.server.componentmanager.*;
7   import java.util.Properties;
8   import java.util.Date;
9   import java.text.DateFormat;
# Line 74 | Line 74 | class ConfigurationServant extends ConfigurationPOA {
74       * Overrides the {@link java.lang.Object#toString() Object.toString()}
75       * method to provide clean logging (every class should have this).
76       *
77 <     * This uses the uk.ac.ukc.iscream.util.FormatName class
77 >     * This uses the uk.org.iscream.cms.server.util.FormatName class
78       * to format the toString()
79       *
80       * @return the name of this class and its CVS revision
# Line 85 | Line 85 | class ConfigurationServant extends ConfigurationPOA {
85              getClass().getName(),
86              REVISION);
87      }
88 <
88 >    
89 >    /**
90 >     * Unhooks this Configuration object from the ORB
91 >     */
92      public void disconnect() {
93          try {
94 <            org.omg.CORBA.Object objRef = _refman.getRootPOA().servant_to_reference(this);
95 <            _refman.getORB().disconnect(objRef);
94 >            byte[] oid = _refman.getRootPOA().servant_to_id(this);
95 >            _refman.getRootPOA().deactivate_object(oid);
96          } catch(Exception e) {
97              _logger.write(this.toString(), Logger.ERROR, "disconnect failed: "+e);
98          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines