Use catch-syntax capabilities for instance checking.

s4u · May 11, 2020 · b6636ad · b6636ad
1 parent c49d239
commit b6636ad
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/org/simplify4u/plugins/PGPVerifyMojo.java b/src/main/java/org/simplify4u/plugins/PGPVerifyMojo.java
@@ -467,9 +467,9 @@ private boolean verifyPGPSignature(Artifact artifact, Artifact ascArtifact) thro
                     + " signature.hashAlgorithm: " + pgpSignature.getHashAlgorithm());
 
             return verifySignatureStatus(pgpSignature.verify(), artifact, publicKey, publicKeyRing);
-        } catch (IOException | PGPException e) {
-            if (e.getCause() instanceof PGPKeyNotFound && keysMap.isKeyMissing(artifact)) {
-                final String logMessage = String.format("%s PGP Key not found on server, consistent with keys map.",
+        } catch (PGPKeyNotFound e) {
+            if (keysMap.isKeyMissing(artifact)) {
+                final String logMessage = String.format("%s PGP key not found on server, consistent with keys map.",
                         artifact.getId());
                 if (quiet) {
                     getLog().debug(logMessage);
@@ -478,6 +478,9 @@ private boolean verifyPGPSignature(Artifact artifact, Artifact ascArtifact) thro
                 }
                 return true;
             }
+            throw new MojoFailureException("Failed to process signature '" + signatureFile + "' for artifact "
+                    + artifact.getId() + ": cannot find public key on keyserver.", e);
+        } catch (IOException | PGPException e) {
             throw new MojoFailureException("Failed to process signature '" + signatureFile + "' for artifact "
                     + artifact.getId(), e);
         }