Index: src/services/org/opennms/netmgt/config/NotificationFactory.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/config/NotificationFactory.java,v
retrieving revision 1.23
diff -u -r1.23 NotificationFactory.java
--- src/services/org/opennms/netmgt/config/NotificationFactory.java	21 Nov 2004 03:31:13 -0000	1.23
+++ src/services/org/opennms/netmgt/config/NotificationFactory.java	22 Nov 2004 18:46:23 -0000
@@ -10,6 +10,7 @@
 //
 // Modifications:
 //
+// 2004 Nov 22: Fixed problem with notifications for threshold events on non-IP interfaces.
 // 2003 Aug 01: Created a proper JOIN for notifications. Bug #752
 // 2003 Jan 31: Added an ORDER BY clause. Bug #648
 // 2003 Jan 08: Allow notification where nodeid, interfaceid and/or serviceid are null.
@@ -281,9 +282,10 @@
                 // ThreadCategory.getInstance(getClass()).debug("Notification
                 // Notif Interface: " + notifIf + " Service: " + notifSrv);
 
-                // if there is no If with the event, there can be no service,
-                // thus check only if the node matches
-                if (eventIf == null) {
+                // if there is no If with the event, or the ip address is
+                //  0.0.0.0, there can be no service, thus check only if the
+                // node matches.
+                if (eventIf == null || eventIf.equals("0.0.0.0")) {
                     if (eventNode == notifNode) {
                         result = true;
                         break;
Index: src/services/org/opennms/netmgt/notifd/BroadcastEventProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/notifd/BroadcastEventProcessor.java,v
retrieving revision 1.22
diff -u -r1.22 BroadcastEventProcessor.java
--- src/services/org/opennms/netmgt/notifd/BroadcastEventProcessor.java	21 Nov 2004 03:31:29 -0000	1.22
+++ src/services/org/opennms/netmgt/notifd/BroadcastEventProcessor.java	22 Nov 2004 18:46:24 -0000
@@ -10,6 +10,7 @@
 //
 // Modifications:
 //
+// 2004 Nov 22: Fixed problem with notifications for threshold events on non-IP interfaces.
 // 2004 Aug 26: Added the ability to trigger notifications on an event and a parameter.
 // 2003 Sep 30: Added a change to support SNMP Thresholding notices.
 // 2003 Jan 31: Cleaned up some unused imports.
@@ -236,7 +237,7 @@
 
         // can't check the database if any of these are null, so let the notice
         // continue
-        if (nodeID == null || ipAddr == null || service == null) {
+        if (nodeID == null || ipAddr == null || service == null || ipAddr.equals("0.0.0.0")) {
             ThreadCategory.getInstance(getClass()).debug("nodeID=" + nodeID + " ipAddr=" + ipAddr + " service=" + service + ". Not checking DB, allowing notice to continue.");
             return true;
         }