From a985e2dac3481dbfe48430c3fe94e0a91bdcb562 Mon Sep 17 00:00:00 2001
From: Tom Lorentsen <toml@giffgaff.co.uk>
Date: Tue, 12 Jun 2018 14:18:45 +0100
Subject: [PATCH] Pass SQS messages to webhook plugin

Prevents a null error when an SQS message can be treated
as a SNS message which does not contain the expected
json payload
---
 .../java/com/base2services/jenkins/SqsQueueHandler.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/base2services/jenkins/SqsQueueHandler.java b/src/main/java/com/base2services/jenkins/SqsQueueHandler.java
index 2ddbd19..d0bf1a6 100644
--- a/src/main/java/com/base2services/jenkins/SqsQueueHandler.java
+++ b/src/main/java/com/base2services/jenkins/SqsQueueHandler.java
@@ -87,8 +87,10 @@ public void run() {
                     String actualMessage = messageParser.extractActualGithubMessage(awsMessage);
                     LOGGER.fine("Actual Github Message: " + actualMessage);
 
-
-                    GHEvent event  = messageParser.getGithubEvent(awsMessage);
+                    GHEvent event = GHEvent.PUSH;
+                    if (awsMessage != actualMessage) {
+                        event = messageParser.getGithubEvent(awsMessage);
+                    }
                     LOGGER.fine("Github event type: " + event.toString());
 
                     switch (event) {