You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by ap...@apache.org on 2014/01/19 23:32:24 UTC
svn commit: r1559591 - in /gora/trunk:
gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
Author: apgiannakidis
Date: Sun Jan 19 22:32:23 2014
New Revision: 1559591
URL: http://svn.apache.org/r1559591
Log:
GORA-231 Provide better error handling in AccumuloStore.readMapping when file does not exist. (Apostolos Giannakidis)
Modified:
gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
Modified: gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java?rev=1559591&r1=1559590&r2=1559591&view=diff
==============================================================================
--- gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java (original)
+++ gora/trunk/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java Sun Jan 19 22:32:23 2014
@@ -363,8 +363,16 @@ public class DataStoreFactory{
}
public static String getMappingFile(Properties properties, DataStore<?,?> store
- , String defaultValue) {
- return findProperty(properties, store, MAPPING_FILE, defaultValue);
+ , String defaultValue) throws IOException {
+
+ String mappingFilename = findProperty(properties, store, MAPPING_FILE, defaultValue);
+
+ InputStream mappingFile = store.getClass().getClassLoader().getResourceAsStream(mappingFilename);
+
+ if (mappingFile == null)
+ throw new IOException("Unable to open mapping file: "+mappingFilename);
+
+ return mappingFilename;
}
private static String getDefaultDataStore(Properties properties) {
Modified: gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java?rev=1559591&r1=1559590&r2=1559591&view=diff
==============================================================================
--- gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java (original)
+++ gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java Sun Jan 19 22:32:23 2014
@@ -95,8 +95,9 @@ public class SolrStore<K, T extends Pers
@Override
public void initialize( Class<K> keyClass, Class<T> persistentClass, Properties properties ) {
super.initialize( keyClass, persistentClass, properties );
- String mappingFile = DataStoreFactory.getMappingFile( properties, this, DEFAULT_MAPPING_FILE );
+
try {
+ String mappingFile = DataStoreFactory.getMappingFile( properties, this, DEFAULT_MAPPING_FILE );
mapping = readMapping( mappingFile );
}
catch ( IOException e ) {