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

Comparing projects/cms/source/server/uk/org/iscream/cms/server/client/MonitorManager.java (file contents):
Revision 1.19 by tdb, Mon Feb 24 20:18:46 2003 UTC vs.
Revision 1.22 by tdb, Sun Sep 25 09:57:40 2005 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 25 | Line 25 | package uk.org.iscream.cms.server.client;
25   import uk.org.iscream.cms.server.componentmanager.*;
26   import uk.org.iscream.cms.server.core.*;
27   import uk.org.iscream.cms.util.*;
28 < import java.util.*;
28 > import java.util.LinkedList;
29 > import java.util.StringTokenizer;
30  
31   /**
32   * A manager for the Monitors.
# Line 199 | Line 200 | public class MonitorManager extends Thread {
200                  // skip the rest of this loop iteration
201                  continue;
202              }
203 +
204 +            if(packet == null) {
205 +                _logger.write(toString(), Logger.WARNING, "Got a null packet when parsing: "+xml);
206 +                // skip to next packet
207 +                continue;
208 +            }
209              
210              // examine the packet and place it in the relevant outgoing queue
211 <            if(packet.getParam("packet.attributes.type").equals("data")) {
211 >            if(packet.getParam("packet.attributes.type") != null &&
212 >               packet.getParam("packet.attributes.type").equals("data")) {
213                  _dataQueue.add(packet);
214              }
215              else {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines