Author: dbrosius
Date: Mon Aug 31 03:36:46 2015
New Revision: 1700191
URL: http://svn.apache.org/r1700191
Log:
simplify, remove dead code
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1700191&r1=1700190&r2=1700191&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Mon Aug 31 03:36:46 2015
@@ -977,7 +977,6 @@ public class RDBDocumentStore implements
String indexedProperty, long startValue, int limit) {
Connection connection = null;
String tableName = getTable(collection);
- List<T> result = Collections.emptyList();
if (indexedProperty != null &&
(!INDEXEDPROPERTIES.contains(indexedProperty))) {
String message = "indexed property " + indexedProperty + " not
supported, query was '>= '" + startValue
+ "'; supported properties are " + INDEXEDPROPERTIES;
@@ -991,19 +990,19 @@ public class RDBDocumentStore implements
connection.commit();
int size = dbresult.size();
- result = new ArrayList<T>(size);
+ List<T> result = new ArrayList<T>(size);
for (int i = 0; i < size; i++) {
RDBRow row = dbresult.set(i, null); // free RDBRow ASAP
T doc = runThroughCache(collection, row, now);
result.add(doc);
}
+ return result;
} catch (Exception ex) {
LOG.error("SQL exception on query", ex);
throw new DocumentStoreException(ex);
} finally {
this.ch.closeConnection(connection);
}
- return result;
}
private <T extends Document> String getTable(Collection<T> collection) {
