You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/17 14:03:52 UTC
[camel] branch main updated: Upgrade snmp4j 3.7.7
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 04f50fca241 Upgrade snmp4j 3.7.7
04f50fca241 is described below
commit 04f50fca241a5cfdf7c47ee9042a4692603790df
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jul 17 16:03:40 2023 +0200
Upgrade snmp4j 3.7.7
---
.../main/java/org/apache/camel/component/snmp/SnmpProducer.java | 9 +++++----
.../java/org/apache/camel/component/snmp/SnmpTrapProducer.java | 4 +++-
parent/pom.xml | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpProducer.java b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpProducer.java
index 81754956d9c..06d94674bf7 100644
--- a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpProducer.java
+++ b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpProducer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.snmp;
import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
import java.util.concurrent.TimeoutException;
import org.apache.camel.Exchange;
@@ -98,7 +97,9 @@ public class SnmpProducer extends DefaultProducer {
super.doStop();
try {
- SecurityModels.getInstance().removeSecurityModel(new Integer32(this.usm.getID()));
+ if (this.usm != null) {
+ SecurityModels.getInstance().removeSecurityModel(new Integer32(this.usm.getID()));
+ }
} finally {
this.targetAddress = null;
this.usm = null;
@@ -146,9 +147,9 @@ public class SnmpProducer extends DefaultProducer {
}
PDU response = responseEvent.getResponse();
String nextOid = null;
- Vector<? extends VariableBinding> variableBindings = response.getVariableBindings();
+ List<? extends VariableBinding> variableBindings = response.getVariableBindings();
for (int i = 0; i < variableBindings.size(); i++) {
- VariableBinding variableBinding = variableBindings.elementAt(i);
+ VariableBinding variableBinding = variableBindings.get(i);
nextOid = variableBinding.getOid().toDottedString();
if (!nextOid.startsWith(oid.toDottedString())) {
matched = false;
diff --git a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapProducer.java b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapProducer.java
index 9a8016f0608..7ddb7133443 100644
--- a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapProducer.java
+++ b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpTrapProducer.java
@@ -67,7 +67,9 @@ public class SnmpTrapProducer extends DefaultProducer {
super.doStop();
try {
- SecurityModels.getInstance().removeSecurityModel(new Integer32(this.usm.getID()));
+ if (this.usm != null) {
+ SecurityModels.getInstance().removeSecurityModel(new Integer32(this.usm.getID()));
+ }
} finally {
this.targetAddress = null;
this.usm = null;
diff --git a/parent/pom.xml b/parent/pom.xml
index 204792e151d..626bcf1c578 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -433,7 +433,7 @@
<smallrye-fault-tolerance-version>6.2.4</smallrye-fault-tolerance-version>
<snakeyaml-version>2.0</snakeyaml-version>
<snakeyaml-engine-version>2.6</snakeyaml-engine-version>
- <snmp4j-version>2.8.15</snmp4j-version>
+ <snmp4j-version>3.7.7</snmp4j-version>
<splunk-version>1.9.4_1</splunk-version>
<spock-version>2.3-groovy-4.0</spock-version>
<spring-batch-version>5.0.2</spring-batch-version>