From f6fe185e3053b21959f1b5b76ec13aa75aa861ff Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Thu, 9 Feb 2006 16:47:23 +0000
Subject: [PATCH] * Log error instead of throwing exception when more than one
 result is returned   by accessname lookup.

---
 src/helma/objectmodel/db/NodeManager.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/helma/objectmodel/db/NodeManager.java b/src/helma/objectmodel/db/NodeManager.java
index c35030a2..0697404d 100644
--- a/src/helma/objectmodel/db/NodeManager.java
+++ b/src/helma/objectmodel/db/NodeManager.java
@@ -1609,7 +1609,7 @@ public final class NodeManager {
                 fetchJoinedNodes(rs, joins, columns.length);
 
                 if (rs.next()) {
-                    throw new RuntimeException("More than one value returned by query.");
+                    app.logError("Warning: More than one value returned for query " + query);
                 }
             } finally {
                 if (logSql) {
@@ -1621,6 +1621,7 @@ public final class NodeManager {
                     try {
                         stmt.close();
                     } catch (Exception ignore) {
+                        // ignore
                     }
                 }
             }
@@ -1717,7 +1718,7 @@ public final class NodeManager {
                 fetchJoinedNodes(rs, joins, columns.length);
 
                 if (rs.next()) {
-                    throw new RuntimeException("More than one value returned by query.");
+                    app.logError("Warning: More than one value returned for query " + query);
                 }
 
                 // Check if node is already cached with primary Key.
@@ -1740,6 +1741,7 @@ public final class NodeManager {
                     try {
                         stmt.close();
                     } catch (Exception ignore) {
+                        // ignore
                     }
                 }
             }
@@ -1772,7 +1774,7 @@ public final class NodeManager {
 
                     if (dbmap == null) {
                         // invalid prototype name!
-                        System.err.println("Warning: Invalid prototype name: " + protoName +
+                        app.logError("Warning: Invalid prototype name: " + protoName +
                                        " - using default");
                         dbmap = dbm;
                         protoName = dbmap.getTypeName();