Remove dead code only used for Vespa 7 nodes

1 files changed, 1 insertions, 12 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
index 716e2f92e74..fd4ace5683a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
@@ -203,18 +203,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
         @Override
         public int servicePid() {
             if (pid == -1) {
-                try {
-                    pid = findServicePid(serviceId());
-                } catch (RuntimeException e1) {
-                    try {
-                        // Workaround for Vespa 7 container clusters having service name 'qrserver'
-                        if (serviceId().equals("container")) pid = findServicePid("qrserver");
-                        else throw e1;
-                    } catch (RuntimeException e2) {
-                        e1.addSuppressed(e2);
-                        throw e1;
-                    }
-                }
+                pid = findServicePid(serviceId());
             }
             return pid;
         }