From: Benny Baumann <BenBE1987@gmx.net>
Date: Sun, 19 Mar 2017 22:56:33 +0000 (+0100)
Subject: Merge changes I34e6379b,I515bdbb5
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=52b4703f262f5d7cb4903d2195b72d296159b1b4;hp=cee7bb7e596486828fb2b10cc8d56c196ed60124

Merge changes I34e6379b,I515bdbb5

* changes:
  udp: keep coverity happy by explicitly preventing null-returns
  upd: keep coverity happy by explicitly throwing
---

diff --git a/src/club/wpia/gigi/pages/account/domain/DomainOverview.java b/src/club/wpia/gigi/pages/account/domain/DomainOverview.java
index bbed095b..496d71e8 100644
--- a/src/club/wpia/gigi/pages/account/domain/DomainOverview.java
+++ b/src/club/wpia/gigi/pages/account/domain/DomainOverview.java
@@ -46,6 +46,6 @@ public class DomainOverview extends ManagedMultiFormPage {
         } else if (req.getParameter("delete") != null) {
             return Form.getForm(req, DomainManagementForm.class);
         }
-        return null;
+        throw new CSRFException();
     }
 }
diff --git a/tests/club/wpia/gigi/testUtils/BusinessTest.java b/tests/club/wpia/gigi/testUtils/BusinessTest.java
index 31d3b094..727310db 100644
--- a/tests/club/wpia/gigi/testUtils/BusinessTest.java
+++ b/tests/club/wpia/gigi/testUtils/BusinessTest.java
@@ -22,8 +22,8 @@ import club.wpia.gigi.dbObjects.Domain;
 import club.wpia.gigi.dbObjects.EmailAddress;
 import club.wpia.gigi.dbObjects.Group;
 import club.wpia.gigi.dbObjects.NamePart;
-import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.dbObjects.NamePart.NamePartType;
+import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.email.EmailProvider;
 import club.wpia.gigi.ping.PingerDaemon;
 import club.wpia.gigi.testUtils.TestEmailReceiver.TestMail;
@@ -76,11 +76,16 @@ public abstract class BusinessTest extends ConfiguredTest {
 
         @Override
         public TestMail receive() {
+            TestMail poll;
             try {
-                return mails.poll(30, TimeUnit.SECONDS);
+                poll = mails.poll(30, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 throw new Error(e);
             }
+            if (poll == null) {
+                throw new AssertionError("Mail receiving timed out");
+            }
+            return poll;
         }
 
         @Override