upd: show timezone in outptu timestamps, Find domain handle org doms

[gigi.git] / src / org / cacert / gigi / dbObjects / Domain.java

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index 1d31db61c2dee3dcf95dc122d74f4e5694344271..78ebc9bbf78ff3f96edee4b8ef27a3888925f183 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -235,14 +235,14 @@ public class Domain implements IdCachable, Verifyable {
         return em;
     }
 
-    public static int searchUserIdByDomain(String domain) {
-        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `memid` FROM `domains` WHERE `domain` = ?")) {
+    public static Domain searchUserIdByDomain(String domain) {
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `domains` WHERE `domain` = ?")) {
             ps.setString(1, domain);
             GigiResultSet res = ps.executeQuery();
             if (res.next()) {
-                return res.getInt(1);
+                return getById(res.getInt(1));
             } else {
-                return -1;
+                return null;
             }
         }
     }