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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/CorbaDataHandler.java (file contents):
Revision 1.9 by tdb, Fri Mar 16 16:11:31 2001 UTC vs.
Revision 1.15 by tdb, Mon May 5 22:05:06 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.org.iscream.clientinterface;
22 > package uk.org.iscream.cms.server.clientinterface;
23  
24   //---IMPORTS---
25 < import uk.org.iscream.util.*;
26 < import uk.org.iscream.componentmanager.*;
27 < import uk.org.iscream.core.*;
8 < import uk.org.iscream.client.*;
25 > import uk.org.iscream.cms.util.*;
26 > import uk.org.iscream.cms.server.componentmanager.*;
27 > import uk.org.iscream.cms.server.core.*;
28  
29  
30   /**
# Line 95 | Line 114 | class CorbaDataHandler extends Thread {
114                      catch (org.omg.CORBA.COMM_FAILURE e) {
115                          // lets stop sending, the client has quit
116                          run = false;
117 <                        _logger.write(toString(), Logger.ERROR, "Connection failure, client shutdown? : "+e);
99 <                        // disconnect the servant above us, or at least try
100 <                        _cchServant.disconnect();
117 >                        _logger.write(toString(), Logger.ERROR, "Connection failure (COMM_FAILURE), client shutdown? : "+e);
118                      }
119 +                    catch (org.omg.CORBA.TRANSIENT e) {
120 +                        // lets stop sending, the client has quit
121 +                        run = false;
122 +                        _logger.write(toString(), Logger.ERROR, "Connection failure (TRANSIENT), client shutdown? : "+e);
123 +                    }
124                  }
125              }
126              catch(InvalidQueueException e) {
# Line 107 | Line 129 | class CorbaDataHandler extends Thread {
129                  _logger.write(toString(), Logger.ERROR, "Queue failure: "+e);
130              }
131          }
132 +        // disconnect the servant above us, or at least try
133 +        _cchServant.disconnect();
134          // if we get here we've been told to stop
135          _logger.write(toString(), Logger.SYSMSG, "Shutting Down");
136          // remove ourselves from the queue
# Line 131 | Line 155 | class CorbaDataHandler extends Thread {
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.org.iscream.util.NameFormat class
158 >     * This uses the uk.org.iscream.cms.util.NameFormat class
159       * to format the toString()
160       *
161       * @return the name of this class and its CVS revision

Diff Legend

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