You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2011/01/11 12:44:47 UTC
svn commit: r1057590 - in /mahout/trunk/core/src:
main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
Author: srowen
Date: Tue Jan 11 11:44:47 2011
New Revision: 1057590
URL: http://svn.apache.org/viewvc?rev=1057590&view=rev
Log:
MAHOUT-582
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java?rev=1057590&r1=1057589&r2=1057590&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModel.java Tue Jan 11 11:44:47 2011
@@ -159,6 +159,7 @@ public class FileDataModel extends Abstr
if (!dataFile.exists() || dataFile.isDirectory()) {
throw new FileNotFoundException(dataFile.toString());
}
+ Preconditions.checkArgument(dataFile.length() > 0L, "dataFile is empty");
Preconditions.checkArgument(minReloadIntervalMS >= 0L, "minReloadIntervalMs must be non-negative");
log.info("Creating FileDataModel for file {}", dataFile);
Modified: mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java?rev=1057590&r1=1057589&r2=1057590&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/cf/taste/impl/model/file/FileDataModelTest.java Tue Jan 11 11:44:47 2011
@@ -186,4 +186,15 @@ public final class FileDataModelTest ext
assertTrue(model.toString().length() > 0);
}
+ @Test
+ public void testEmptyFile() throws Exception {
+ File file = getTestTempFile("empty");
+ writeLines(file, new String[0]); //required to create file.
+ try {
+ new FileDataModel(file);
+ fail("Should throw an IllegalArgumentException");
+ } catch (IllegalArgumentException iae) {
+ // good
+ }
+ }
}