* Log error instead of throwing exception when more than one result is returned
by accessname lookup.
This commit is contained in:
parent
852543386c
commit
f6fe185e30
1 changed files with 5 additions and 3 deletions
|
@ -1609,7 +1609,7 @@ public final class NodeManager {
|
||||||
fetchJoinedNodes(rs, joins, columns.length);
|
fetchJoinedNodes(rs, joins, columns.length);
|
||||||
|
|
||||||
if (rs.next()) {
|
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 {
|
} finally {
|
||||||
if (logSql) {
|
if (logSql) {
|
||||||
|
@ -1621,6 +1621,7 @@ public final class NodeManager {
|
||||||
try {
|
try {
|
||||||
stmt.close();
|
stmt.close();
|
||||||
} catch (Exception ignore) {
|
} catch (Exception ignore) {
|
||||||
|
// ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1717,7 +1718,7 @@ public final class NodeManager {
|
||||||
fetchJoinedNodes(rs, joins, columns.length);
|
fetchJoinedNodes(rs, joins, columns.length);
|
||||||
|
|
||||||
if (rs.next()) {
|
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.
|
// Check if node is already cached with primary Key.
|
||||||
|
@ -1740,6 +1741,7 @@ public final class NodeManager {
|
||||||
try {
|
try {
|
||||||
stmt.close();
|
stmt.close();
|
||||||
} catch (Exception ignore) {
|
} catch (Exception ignore) {
|
||||||
|
// ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1772,7 +1774,7 @@ public final class NodeManager {
|
||||||
|
|
||||||
if (dbmap == null) {
|
if (dbmap == null) {
|
||||||
// invalid prototype name!
|
// invalid prototype name!
|
||||||
System.err.println("Warning: Invalid prototype name: " + protoName +
|
app.logError("Warning: Invalid prototype name: " + protoName +
|
||||||
" - using default");
|
" - using default");
|
||||||
dbmap = dbm;
|
dbmap = dbm;
|
||||||
protoName = dbmap.getTypeName();
|
protoName = dbmap.getTypeName();
|
||||||
|
|
Loading…
Add table
Reference in a new issue