Merge "Fix error message"

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

diff --git a/src/org/cacert/gigi/dbObjects/CertificateOwner.java b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
index daff8bcb787866d631c83793f3794876c3beccf9..0b072d1d6eaffc65bef265d9541dc493937b833f 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/CertificateOwner.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateOwner.java
@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 
@@ -49,8 +50,10 @@ public abstract class CertificateOwner implements IdCachable, Serializable {
                     } else if (rs.getString("oid") != null) {
                         myCache.put(u = new Organisation(rs));
                     } else {
-                        System.err.print("Malformed cert owner: " + id);
+                        System.err.println("Malformed cert owner: " + id);
                     }
+                } catch (GigiApiException e) {
+                    throw new Error(e);
                 }
             }
         }
@@ -124,7 +127,7 @@ public abstract class CertificateOwner implements IdCachable, Serializable {
 
     public static CertificateOwner getByEnabledSerial(String serial) {
         try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `memid` FROM `certs` INNER JOIN `logincerts` ON `logincerts`.`id`=`certs`.`id` WHERE serial=? AND `revoked` is NULL")) {
-            prep.setString(1, serial.toLowerCase());
+            prep.setString(1, serial);
             GigiResultSet res = prep.executeQuery();
             if (res.next()) {
                 return getById(res.getInt(1));