Revision: 3477
Author: brozow
Date: 2006-06-11 08:25:40 -0700 (Sun, 11 Jun 2006)
ViewCVS: http://svn.sourceforge.net/opennms/?rev=3477&view=rev
Log Message:
-----------
Fix too many forcerescan events
Modified Paths:
--------------
opennms/branches/pre-maven-branch/.classpath
opennms/branches/pre-maven-branch/OpenNMSService.launch
opennms/branches/pre-maven-branch/src/services/org/opennms/netmgt/collectd/CollectionSet.java
Modified: opennms/branches/pre-maven-branch/.classpath
===================================================================
--- opennms/branches/pre-maven-branch/.classpath 2006-06-11 13:38:21 UTC (rev 3476)
+++ opennms/branches/pre-maven-branch/.classpath 2006-06-11 15:25:40 UTC (rev 3477)
@@ -46,7 +46,7 @@
<classpathentry kind="lib" path="lib/postgresql-8.1-404.jdbc3.jar"/>
<classpathentry kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="lib/hibernate-3.0.5.jar"/>
- <classpathentry kind="lib" path="lib/jrobin-1.5.2.jar"/>
+ <classpathentry sourcepath="/Users/brozow/Desktop/JRobinLite-1.5.2/src" kind="lib" path="lib/jrobin-1.5.2.jar"/>
<classpathentry sourcepath="/JUNIT_SRC_HOME" kind="var" path="JUNIT_HOME/junit.jar"/>
<classpathentry kind="lib" path="lib/hsqldb.jar"/>
<classpathentry kind="lib" path="lib/jradius-client.jar"/>
Modified: opennms/branches/pre-maven-branch/OpenNMSService.launch
===================================================================
--- opennms/branches/pre-maven-branch/OpenNMSService.launch 2006-06-11 13:38:21 UTC (rev 3476)
+++ opennms/branches/pre-maven-branch/OpenNMSService.launch 2006-06-11 15:25:40 UTC (rev 3477)
@@ -2,18 +2,24 @@
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.opennms.netmgt.vmmgr.Manager"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="start"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry type="4" path="1" containerPath="org.eclipse.jdt.launching.JRE_CONTAINER"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry"> <memento variableString="${workspace_loc:opennms/dist/etc}"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="opennms"/> </runtimeClasspathEntry> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry type="2" path="3" internalArchive="/opennms/lib/pg74.215.jdbc3.jar"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="opennms" exportedEntriesOnly="false"/> </runtimeClasspathEntry> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry type="2" path="3" internalArchive="/opennms/lib/postgresql-8.1-404.jdbc3.jar"/> "/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opennms"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256m -Djava.library.path=${workspace_loc:opennms/dist/lib} -DOPENNMSLAUNCH -Dopennms.home=${workspace_loc:opennms/dist} -Djcifs.properties=${workspace_loc:opennms/dist/etc/jcifs.properties}"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/opennms"/>
+</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:opennms/dist/bin}"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.STOP_IN_MAIN" value="true"/>
Modified: opennms/branches/pre-maven-branch/src/services/org/opennms/netmgt/collectd/CollectionSet.java
===================================================================
--- opennms/branches/pre-maven-branch/src/services/org/opennms/netmgt/collectd/CollectionSet.java 2006-06-11 13:38:21 UTC (rev 3476)
+++ opennms/branches/pre-maven-branch/src/services/org/opennms/netmgt/collectd/CollectionSet.java 2006-06-11 15:25:40 UTC (rev 3477)
@@ -83,7 +83,6 @@
private CollectionAgent m_agent;
private OnmsSnmpCollection m_snmpCollection;
- private boolean m_rescanTriggered;
private SnmpIfCollector m_ifCollector;
private CollectionSet.IfNumberTracker m_ifNumber;
private SnmpNodeCollector m_nodeCollector;
@@ -201,14 +200,6 @@
visitor.completeCollectionSet(this);
}
- public void triggerRescan() {
- m_rescanTriggered = true;
- }
-
- public boolean rescanTriggered() {
- return m_rescanTriggered;
- }
-
CollectionTracker getTracker() {
List trackers = new ArrayList(3);
@@ -306,18 +297,15 @@
}
public boolean rescanNeeded() {
- if (rescanTriggered()) {
- log().debug("Sending rescan event for "+getCollectionAgent()+" because it was triggered by a missing resource");
- return true;
- }
-
+
final RescanNeeded rescanNeeded = new RescanNeeded();
visit(new ResourceVisitor() {
public void visitResource(CollectionResource resource) {
- if (resource.rescanNeeded())
+ if (resource.rescanNeeded()) {
log().debug("Sending rescan event for "+getCollectionAgent()+" because resource "+resource+" indicated it was needed");
rescanNeeded.rescanIndicated();
+ }
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
