Fix reading/writing voteSameTopic twice

Use string builder instead of replace method to build a string pattern
jenkinsci · Jun 6, 2021 · a5bbd63 · a5bbd63
1 parent c689bfc
commit a5bbd63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/config/Config.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/config/Config.java
@@ -415,8 +415,6 @@ public void setValues(JSONObject formData) {
             useRestApi = false;
         }
 
-        voteSameTopic = formData.optBoolean("voteSameTopic", false);
-
         replicationConfig = ReplicationConfig.createReplicationConfigFromJSON(formData);
     }
 

diff --git a/...in/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/GerritNotifier.java b/...in/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/GerritNotifier.java
@@ -85,8 +85,9 @@ public GerritNotifier(IGerritHudsonTriggerConfig config, GerritCmdRunner cmdRunn
     private void notifySameTopic(ChangeBasedEvent event, String command) {
         Topic topic = event.getChange().getTopicObject();
         if (topic != null) {
-            String pattern = "CHANGE,PATCHSET".replace("CHANGE", event.getChange().getNumber()).replace("PATCHSET",
-                    event.getPatchSet().getNumber());
+            String pattern = new StringBuilder(event.getChange().getNumber()).append(',')
+                    .append(event.getPatchSet().getNumber()).toString();
+
             if (!command.contains(pattern)) {
                 logger.error("command {} has no pattern {}", command, pattern);
                 return;
@@ -102,8 +103,8 @@ private void notifySameTopic(ChangeBasedEvent event, String command) {
                         continue;
                     }
                     PatchSet patchSet = entry.getValue();
-                    String substitution = "CHANGE,PATCHSET".replace("CHANGE", change.getNumber())
-                            .replace("PATCHSET", patchSet.getNumber());
+                    String substitution = new StringBuilder(change.getNumber()).append(',').append(patchSet.getNumber())
+                            .toString();
                     String command2 = command.replace(pattern, substitution);
                     logger.trace("notifySameTopic: {} {} {}", topic, change, command2);
                     server.getCmdRunner().sendCommand(command2);