--- capsd/RescanProcessor.java.old	2006-09-05 08:48:01.330150078 -0400
+++ capsd/RescanProcessor.java	2006-08-25 15:16:24.000000000 -0400
@@ -1288,8 +1288,8 @@ public final class RescanProcessor imple
                     ifSvcEntry.setStatus(DbIfServiceEntry.STATUS_UNMANAGED);
                 else {
                     boolean svcToBePolled = false;
+                    ipPkg = pollerCfgFactory.getFirstPackageMatch(ifaddr.getHostAddress());
                     if (ipPkg != null) {
-                        ipPkg = pollerCfgFactory.getFirstPackageMatch(ifaddr.getHostAddress());
                         svcToBePolled = pollerCfgFactory.isPolled(p.getProtocolName(), ipPkg);
 
                         if (!svcToBePolled)
@@ -1299,7 +1299,10 @@ public final class RescanProcessor imple
                     if (svcToBePolled)
                         ifSvcEntry.setStatus(DbIfServiceEntry.STATUS_ACTIVE);
                     else
+                    {
                         ifSvcEntry.setStatus(DbIfServiceEntry.STATUS_NOT_POLLED);
+                        log.debug("updateServiceInfo: node " + node.getNodeId() + ": Setting status to NOT_POLLED");
+                    }
                 }
 
                 // Set qualifier if available. Currently the qualifier field
@@ -1309,7 +1312,7 @@ public final class RescanProcessor imple
                     try {
                         Integer port = (Integer) p.getQualifiers().get("port");
                         if (log.isDebugEnabled())
-                            log.debug("updateIfServices: got a port qualifier: " + port + " for service: " + p.getProtocolName());
+                            log.debug("updateServiceInfo: got a port qualifier: " + port + " for service: " + p.getProtocolName());
                         ifSvcEntry.setQualifier(port.toString());
                     } catch (ClassCastException ccE) {
                         // Do nothing
@@ -1893,7 +1896,10 @@ public final class RescanProcessor imple
                 if (svcToBePolled)
                     ifSvcEntry.setStatus(DbIfServiceEntry.STATUS_ACTIVE);
                 else
+                {
                     ifSvcEntry.setStatus(DbIfServiceEntry.STATUS_NOT_POLLED);
+                    log.debug("addSupportedProtocols: node " + node.getNodeId() + ": Setting status to NOT_POLLED");
+                }
             }
 
             // Set qualifier if available. Currently the qualifier field