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/PacketSorter.java
(Generate patch)

Comparing projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/PacketSorter.java (file contents):
Revision 1.22 by tdb, Wed Feb 5 16:43:46 2003 UTC vs.
Revision 1.26 by tdb, Sun Sep 25 09:57:41 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.clientinterface;
25   import uk.org.iscream.cms.util.*;
26   import uk.org.iscream.cms.server.componentmanager.*;
27   import uk.org.iscream.cms.server.core.*;
28 < import java.util.*;
28 > import java.util.HashMap;
29 > import java.util.Iterator;
30 > import java.util.LinkedList;
31 > import java.util.List;
32 > import java.util.StringTokenizer;
33  
34   /**
35   * Receives data from the incoming CORBA servant, places
# Line 131 | Line 135 | class PacketSorter extends Thread {
135                  continue;
136              }
137              
138 +            if(packet == null) {
139 +                continue;
140 +            }
141 +            
142              String packetType = packet.getParam("packet.attributes.type");
143              // check if we need to send it regardless
144 <            if(packetType.equals("data") || packetType.equals("heartbeat")) {
144 >            if(packetType.equals("data")) {
145                  String host = packet.getParam("packet.attributes.machine_name");
146                  
147                  // look in the hostMap to see if anyone wants this data

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines