You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by gs...@apache.org on 2013/06/09 15:32:41 UTC
svn commit: r1491214 [2/2] - in /mahout/trunk: ./
core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/
core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/
core/src/main/java/org/apache/mahout/cf/taste/impl/model/file/
core/src/main/java/org...
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/bookcrossing/BookCrossingDataModel.java Sun Jun 9 13:32:39 2013
@@ -86,7 +86,7 @@ public final class BookCrossingDataModel
resultFile.delete();
throw ioe;
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
return resultFile;
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java Sun Jun 9 13:32:39 2013
@@ -252,7 +252,7 @@ public final class MailToPrefsDriver ext
for (Pair<Writable, Writable> record
: new SequenceFileDirIterable<Writable, Writable>(filesPattern, PathType.GLOB, null, null, true, conf)) {
if (currentChunkSize > chunkSizeLimit) {
- Closeables.closeQuietly(dictWriter);
+ Closeables.close(dictWriter, true);
chunkIndex++;
chunkPath = new Path(dictionaryPathBase, name + chunkIndex);
@@ -269,7 +269,7 @@ public final class MailToPrefsDriver ext
}
maxTermDimension[0] = i;
} finally {
- Closeables.closeQuietly(dictWriter);
+ Closeables.close(dictWriter, true);
}
return chunkPaths;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java Sun Jun 9 13:32:39 2013
@@ -74,7 +74,7 @@ public final class GroupLensDataModel ex
resultFile.delete();
throw ioe;
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
return resultFile;
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/DataFileIterator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/DataFileIterator.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/DataFileIterator.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/DataFileIterator.java Sun Jun 9 13:32:39 2013
@@ -129,7 +129,11 @@ public final class DataFileIterator
@Override
public void close() {
endOfData();
- Closeables.closeQuietly(lineIterator);
+ try {
+ Closeables.close(lineIterator, true);
+ } catch (IOException e) {
+ //nothing
+ }
}
/**
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java Sun Jun 9 13:32:39 2013
@@ -75,7 +75,7 @@ public final class ToCSV {
}
}
} finally {
- Closeables.closeQuietly(outWriter);
+ Closeables.close(outWriter, true);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java Sun Jun 9 13:32:39 2013
@@ -89,7 +89,7 @@ public final class Track1Runner {
}
}
} finally {
- Closeables.closeQuietly(out);
+ Closeables.close(out, true);
}
end = System.currentTimeMillis();
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java Sun Jun 9 13:32:39 2013
@@ -117,7 +117,7 @@ public final class Track1SVDRunner {
}
}
} finally {
- Closeables.closeQuietly(out);
+ Closeables.close(out, true);
}
log.info("wrote estimates to {}, done.", resultFile.getAbsolutePath());
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java Sun Jun 9 13:32:39 2013
@@ -94,7 +94,7 @@ public final class Track2Runner {
out.write(result.getResultBytes());
}
} finally {
- Closeables.closeQuietly(out);
+ Closeables.close(out, true);
}
end = System.currentTimeMillis();
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java Sun Jun 9 13:32:39 2013
@@ -98,12 +98,12 @@ public final class NetflixDatasetConvert
}
}
} finally {
- Closeables.closeQuietly(lines);
+ Closeables.close(lines, true);
}
}
log.info("{} ratings processed. done.", ratingsProcessed);
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
log.info("Reading probes...");
@@ -142,7 +142,7 @@ public final class NetflixDatasetConvert
}
log.info("{} ratings processed. done.", ratingsProcessed);
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/NewsgroupHelper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/NewsgroupHelper.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/NewsgroupHelper.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/NewsgroupHelper.java Sun Jun 9 13:32:39 2013
@@ -102,7 +102,7 @@ public final class NewsgroupHelper {
countWords(analyzer, words, reader, overallCounts);
}
} finally {
- Closeables.closeQuietly(reader);
+ Closeables.close(reader, true);
}
Vector v = new RandomAccessSparseVector(FEATURES);
@@ -127,6 +127,6 @@ public final class NewsgroupHelper {
}
overallCounts.addAll(words);
ts.end();
- Closeables.closeQuietly(ts);
+ Closeables.close(ts, true);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/df/mapreduce/TestForest.java Sun Jun 9 13:32:39 2013
@@ -307,7 +307,7 @@ public class TestForest extends Configur
scanner.close();
} finally {
- Closeables.closeQuietly(input);
+ Closeables.close(input, true);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java Sun Jun 9 13:32:39 2013
@@ -184,7 +184,7 @@ public class AdaptiveLogisticModelParame
try {
return loadFromStream(input);
} finally {
- Closeables.closeQuietly(input);
+ Closeables.close(input, true);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/LogisticModelParameters.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/LogisticModelParameters.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/LogisticModelParameters.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/LogisticModelParameters.java Sun Jun 9 13:32:39 2013
@@ -115,7 +115,7 @@ public class LogisticModelParameters imp
try {
return loadFrom(input);
} finally {
- Closeables.closeQuietly(input);
+ Closeables.close(input, true);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/PrintResourceOrFile.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/PrintResourceOrFile.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/PrintResourceOrFile.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/PrintResourceOrFile.java Sun Jun 9 13:32:39 2013
@@ -40,7 +40,7 @@ public final class PrintResourceOrFile {
System.out.println(line);
}
} finally {
- Closeables.closeQuietly(in);
+ Closeables.close(in, true);
}
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/SimpleCsvExamples.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/SimpleCsvExamples.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/SimpleCsvExamples.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/SimpleCsvExamples.java Sun Jun 9 13:32:39 2013
@@ -89,7 +89,7 @@ public final class SimpleCsvExamples {
out.println(x);
}
} finally {
- Closeables.closeQuietly(out);
+ Closeables.close(out, false);
}
} else if ("--parse".equals(args[0])) {
BufferedReader in = Files.newReader(new File(args[1]), Charsets.UTF_8);
@@ -105,7 +105,7 @@ public final class SimpleCsvExamples {
line = in.readLine();
}
} finally {
- Closeables.closeQuietly(in);
+ Closeables.close(in, true);
}
String separator = "";
for (int i = 0; i < FIELDS; i++) {
@@ -126,7 +126,7 @@ public final class SimpleCsvExamples {
line = in.read();
}
} finally {
- Closeables.closeQuietly(in);
+ Closeables.close(in, true);
}
String separator = "";
for (int i = 0; i < FIELDS; i++) {
@@ -277,7 +277,11 @@ public final class SimpleCsvExamples {
@Override
public void close() {
- Closeables.closeQuietly(in);
+ try {
+ Closeables.close(in, true);
+ } catch (IOException e) {
+ //nothing
+ }
}
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java Sun Jun 9 13:32:39 2013
@@ -106,7 +106,7 @@ public final class TrainLogistic {
line = in.readLine();
}
} finally {
- Closeables.closeQuietly(in);
+ Closeables.close(in, true);
}
}
@@ -114,7 +114,7 @@ public final class TrainLogistic {
try {
lmp.saveTo(modelOutput);
} finally {
- Closeables.closeQuietly(modelOutput);
+ Closeables.close(modelOutput, true);
}
output.println(lmp.getNumFeatures());
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java Sun Jun 9 13:32:39 2013
@@ -325,7 +325,7 @@ public class DisplayClustering extends F
writer.append(new Text("sample_" + i++), vw);
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java Sun Jun 9 13:32:39 2013
@@ -72,7 +72,7 @@ public class DisplaySpectralKMeans exten
}
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
int maxIter = 10;
double convergenceDelta = 0.001;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java Sun Jun 9 13:32:39 2013
@@ -139,7 +139,7 @@ public final class LastfmDataConverter {
msg = usedMemory() + "Converting data to internal vector format: ";
System.out.print('\r' + msg + percentDone + "% Completed\n");
} finally {
- Closeables.closeQuietly(br);
+ Closeables.close(br, true);
}
return itemFeaturesMap;
}
@@ -183,7 +183,7 @@ public final class LastfmDataConverter {
}
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
return true;
}
Modified: mahout/trunk/examples/src/test/java/org/apache/mahout/classifier/sgd/TrainLogisticTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/test/java/org/apache/mahout/classifier/sgd/TrainLogisticTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/examples/src/test/java/org/apache/mahout/classifier/sgd/TrainLogisticTest.java (original)
+++ mahout/trunk/examples/src/test/java/org/apache/mahout/classifier/sgd/TrainLogisticTest.java Sun Jun 9 13:32:39 2013
@@ -83,7 +83,7 @@ public class TrainLogisticTest extends M
OnlineLogisticRegression lrOut = lmpOut.createRegression();
verifyModel(lmpOut, csvOut, data, lrOut, expectedValues);
} finally {
- Closeables.closeQuietly(in);
+ Closeables.close(in, true);
}
sw = new StringWriter();
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/GenericJDBCDataModel.java Sun Jun 9 13:32:39 2013
@@ -136,7 +136,7 @@ public final class GenericJDBCDataModel
props.load(is);
return props;
} finally {
- Closeables.closeQuietly(is);
+ Closeables.close(is, true);
}
} catch (IOException ioe) {
throw new TasteException(ioe);
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/evaluation/RepresentativePointsDriver.java Sun Jun 9 13:32:39 2013
@@ -201,7 +201,7 @@ public final class RepresentativePointsD
}
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, false);
}
writer = new SequenceFile.Writer(fs, conf, new Path(stateOut, "part-m-" + part++), IntWritable.class,
VectorWritable.class);
@@ -210,7 +210,7 @@ public final class RepresentativePointsD
writer.append(new IntWritable(entry.getKey()), new VectorWritable(entry.getValue().getVector()));
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java Sun Jun 9 13:32:39 2013
@@ -185,7 +185,7 @@ public final class LDAPrintTopics {
}
} finally {
if (!printingToSystemOut) {
- Closeables.closeQuietly(out);
+ Closeables.close(out, true);
} else {
out.flush();
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java Sun Jun 9 13:32:39 2013
@@ -71,7 +71,7 @@ public final class SequenceFilesFromMail
log.info("Parsed {} messages from {} in time: {}", cnt, options.getInput().getAbsolutePath(), finish - start);
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorMapper.java Sun Jun 9 13:32:39 2013
@@ -78,7 +78,7 @@ public class WikipediaDatasetCreatorMapp
new Text(SPACE_NON_ALPHA_PATTERN.matcher(catMatch).replaceAll("_")),
new Text(contents.toString()));
stream.end();
- Closeables.closeQuietly(stream);
+ Closeables.close(stream, true);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java Sun Jun 9 13:32:39 2013
@@ -217,7 +217,7 @@ public final class WikipediaXmlSplitter
try {
chunkWriter.write(content.toString(), 0, content.length());
} finally {
- Closeables.closeQuietly(chunkWriter);
+ Closeables.close(chunkWriter, true);
}
if (filenumber >= numChunks) {
break;
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/XmlInputFormat.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/XmlInputFormat.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/XmlInputFormat.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/XmlInputFormat.java Sun Jun 9 13:32:39 2013
@@ -103,7 +103,7 @@ public class XmlInputFormat extends Text
@Override
public void close() throws IOException {
- Closeables.closeQuietly(fsin);
+ Closeables.close(fsin, true);
}
@Override
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java Sun Jun 9 13:32:39 2013
@@ -154,7 +154,7 @@ public final class SequenceFileDumper ex
} finally {
if (shouldClose) {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SplitInput.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SplitInput.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SplitInput.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SplitInput.java Sun Jun 9 13:32:39 2013
@@ -418,9 +418,9 @@ public class SplitInput extends Abstract
}
} finally {
- Closeables.closeQuietly(reader);
- Closeables.closeQuietly(trainingWriter);
- Closeables.closeQuietly(testWriter);
+ Closeables.close(reader, true);
+ Closeables.close(trainingWriter, false);
+ Closeables.close(testWriter, false);
}
} else {
SequenceFileIterator<Writable, Writable> iterator =
@@ -456,9 +456,9 @@ public class SplitInput extends Abstract
}
} finally {
- Closeables.closeQuietly(iterator);
- Closeables.closeQuietly(trainingWriter);
- Closeables.closeQuietly(testWriter);
+ Closeables.close(iterator, true);
+ Closeables.close(trainingWriter, false);
+ Closeables.close(testWriter, false);
}
}
log.info("file: {}, input: {} train: {}, test: {} starting at {}",
@@ -684,7 +684,7 @@ public class SplitInput extends Abstract
lineCount++;
}
} finally {
- Closeables.closeQuietly(reader);
+ Closeables.close(reader, true);
}
return lineCount;
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java Sun Jun 9 13:32:39 2013
@@ -217,7 +217,7 @@ public final class ClusterDumper extends
log.info("Wrote {} clusters", numWritten);
} finally {
if (shouldClose) {
- Closeables.closeQuietly(clusterWriter);
+ Closeables.close(clusterWriter, true);
} else {
if (clusterWriter instanceof GraphMLClusterWriter) {
clusterWriter.close();
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/io/ChunkedWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/io/ChunkedWriter.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/io/ChunkedWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/io/ChunkedWriter.java Sun Jun 9 13:32:39 2013
@@ -66,7 +66,7 @@ public final class ChunkedWriter impleme
/** Writes a new key-value pair, creating a new sequence file if necessary.*/
public void write(String key, String value) throws IOException {
if (currentChunkSize > maxChunkSizeInBytes) {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, false);
currentChunkID++;
writer = new SequenceFile.Writer(fs, conf, getPath(currentChunkID), Text.class, Text.class);
currentChunkSize = 0;
@@ -79,8 +79,8 @@ public final class ChunkedWriter impleme
}
@Override
- public void close() {
- Closeables.closeQuietly(writer);
+ public void close() throws IOException {
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/regex/AnalyzerTransformer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/regex/AnalyzerTransformer.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/regex/AnalyzerTransformer.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/regex/AnalyzerTransformer.java Sun Jun 9 13:32:39 2013
@@ -62,7 +62,11 @@ public class AnalyzerTransformer impleme
} catch (IOException e) {
throw new IllegalStateException(e);
} finally {
- Closeables.closeQuietly(ts);
+ try {
+ Closeables.close(ts, true);
+ } catch (IOException e) {
+ //nothing
+ }
}
return result.toString();
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java Sun Jun 9 13:32:39 2013
@@ -27,6 +27,7 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.util.ToolRunner;
import org.apache.mahout.common.AbstractJob;
import org.apache.mahout.common.Pair;
+import org.apache.mahout.common.commandline.DefaultOptionCreator;
import org.apache.mahout.common.iterator.sequencefile.PathFilters;
import org.apache.mahout.common.iterator.sequencefile.PathType;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileDirIterable;
@@ -38,14 +39,14 @@ import java.util.List;
import java.util.Map;
/**
- * Converts a vector representation of documents into a {@code document x term} matrix.
- * The input data is in {@code SequenceFile<Text,VectorWritable>} format (as generated by
+ * Converts a vector representation of documents into a {@code document x terms} matrix.
+ * The input data is in {@code SequenceFile<Text,VectorWritable>} format (as generated by
* {@link org.apache.mahout.vectorizer.SparseVectorsFromSequenceFiles SparseVectorsFromSequenceFiles}
* or by {@link org.apache.mahout.vectorizer.EncodedVectorsFromSequenceFiles EncodedVectorsFromSequenceFiles})
* and generates the following two files as output:
- * <ul><li>A file called "matrix" in {@code SequenceFile<IntWritable,VectorWritable>} format.</li>
- * <li>A file called "docIndex" in {@code SequenceFile<IntWritable,Text>} format.</li></ul>
- * The input file is the join of the two output files on the generated int key.
+ * <ul><li>A file called "matrix" of format {@code SequenceFile<IntWritable,VectorWritable>}.</li>
+ * <li>A file called "docIndex" of format {@code SequenceFile<IntWritable,Text>}.</li></ul>
+ * The input file can be regenerated by joining the two output files on the generated int key.
* In other words, {@code RowIdJob} replaces the document text ids by integers.
* The original document text ids can still be retrieved from the "docIndex".
*/
@@ -97,8 +98,8 @@ public class RowIdJob extends AbstractJo
log.info("Wrote out matrix with {} rows and {} columns to {}", i, numCols, matrixPath);
return 0;
} finally {
- Closeables.closeQuietly(indexWriter);
- Closeables.closeQuietly(matrixWriter);
+ Closeables.close(indexWriter, true);
+ Closeables.close(matrixWriter, true);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFIterator.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFIterator.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFIterator.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/ARFFIterator.java Sun Jun 9 13:32:39 2013
@@ -56,7 +56,11 @@ final class ARFFIterator extends Abstrac
throw new IllegalStateException(ioe);
}
if (line == null) {
- Closeables.closeQuietly(reader);
+ try {
+ Closeables.close(reader, true);
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
+ }
return endOfData();
}
Vector result;
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java Sun Jun 9 13:32:39 2013
@@ -162,7 +162,7 @@ public final class Driver {
writeLabelBindings(writer, arffModel, delimiter);
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
@@ -251,7 +251,7 @@ public final class Driver {
writeLabelBindings(dictOut, model, delimiter, jsonDictonary);
log.info("Wrote: {} vectors", numDocs);
} finally {
- Closeables.closeQuietly(vectorWriter);
+ Closeables.close(vectorWriter, true);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java Sun Jun 9 13:32:39 2013
@@ -59,7 +59,7 @@ public class DelimitedTermInfoWriter imp
writer.write('\n');
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java Sun Jun 9 13:32:39 2013
@@ -66,7 +66,7 @@ public class SequenceFileVectorWriter im
@Override
public void close() throws IOException {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
public SequenceFile.Writer getWriter() {
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java Sun Jun 9 13:32:39 2013
@@ -65,6 +65,6 @@ public class TextualVectorWriter impleme
@Override
public void close() throws IOException {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java Sun Jun 9 13:32:39 2013
@@ -140,7 +140,7 @@ public class ClusterLabels {
}
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
@@ -231,7 +231,7 @@ public class ClusterLabels {
Collections.sort(clusteredTermInfo);
// Cleanup
- Closeables.closeQuietly(reader);
+ Closeables.close(reader, true);
termEntryMap.clear();
return clusteredTermInfo.subList(0, Math.min(clusteredTermInfo.size(), maxLabels));
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java Sun Jun 9 13:32:39 2013
@@ -121,7 +121,7 @@ public final class TestClusterDumper ext
writer.addDocument(doc);
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
IndexReader reader = DirectoryReader.open(directory);
@@ -330,7 +330,7 @@ public final class TestClusterDumper ext
writer.append(key, value);
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
// now run the Canopy job to prime kMeans canopies
CanopyDriver.run(conf, svdData, output, measure, 8, 4, false, 0.0, true);
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java Sun Jun 9 13:32:39 2013
@@ -63,7 +63,7 @@ public final class SequenceFilesFromMail
gzOut.write(testMailMessages.getBytes("UTF-8"));
gzOut.finish();
} finally {
- Closeables.closeQuietly(gzOut);
+ Closeables.close(gzOut, true);
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java Sun Jun 9 13:32:39 2013
@@ -80,7 +80,7 @@ public final class TestSequenceFilesFrom
try {
writer.write(aData[1]);
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
}
@@ -113,7 +113,7 @@ public final class TestSequenceFilesFrom
assertEquals(retrievedData, record.getSecond().toString().trim());
}
} finally {
- Closeables.closeQuietly(iterator);
+ Closeables.close(iterator, true);
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java Sun Jun 9 13:32:39 2013
@@ -85,19 +85,21 @@ public final class SplitInputTest extend
private void writeMultipleInputFiles() throws IOException {
Writer writer = null;
String currentLabel = null;
-
- for (String[] entry : ClassifierData.DATA) {
+ try {
+ for (String[] entry : ClassifierData.DATA) {
if (!entry[0].equals(currentLabel)) {
currentLabel = entry[0];
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
writer = new BufferedWriter(new OutputStreamWriter(fs.create(new Path(tempInputDirectory, currentLabel)),
Charsets.UTF_8));
}
countMap.adjustOrPutValue(currentLabel, 1, 1);
writer.write(currentLabel + '\t' + entry[1] + '\n');
+ }
+ }finally {
+ Closeables.close(writer, true);
}
- Closeables.closeQuietly(writer);
}
private void writeSingleInputFile() throws IOException {
@@ -107,7 +109,7 @@ public final class SplitInputTest extend
writer.write(entry[0] + '\t' + entry[1] + '\n');
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java Sun Jun 9 13:32:39 2013
@@ -47,7 +47,7 @@ public class CSVVectorIteratorTest exten
Iterable<Vector> iter = new RandomVectorIterable(50);
writer.write(iter);
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
Iterator<Vector> csvIter = new CSVVectorIterator(new StringReader(sWriter.getBuffer().toString()));
int count = 0;
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java Sun Jun 9 13:32:39 2013
@@ -47,7 +47,7 @@ public final class VectorWriterTest exte
try {
writer.write(new RandomVectorIterable(50));
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
long count = HadoopUtil.countRecords(path, conf);
@@ -64,7 +64,7 @@ public final class VectorWriterTest exte
vectors.add(new DenseVector(new double[]{1.3, 1.5, 3.5}));
writer.write(vectors);
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
String buffer = strWriter.toString();
assertNotNull(buffer);
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java Sun Jun 9 13:32:39 2013
@@ -92,7 +92,7 @@ public class CachedTermInfoTest extends
writer.addDocument(doc);
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
return directory;
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/DriverTest.java Sun Jun 9 13:32:39 2013
@@ -126,7 +126,7 @@ public class DriverTest extends MahoutTe
indexTerms.add(term.toString());
}
} finally {
- Closeables.closeQuietly(reader);
+ Closeables.close(reader, true);
}
Set<String> expectedIndexTerms = Sets.newHashSet("all", "bind", "bring", "darkness", "find", "one", "ring", "rule");
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java?rev=1491214&r1=1491213&r2=1491214&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java Sun Jun 9 13:32:39 2013
@@ -179,7 +179,7 @@ public final class LuceneIterableTest ex
writer.addDocument(doc);
}
} finally {
- Closeables.closeQuietly(writer);
+ Closeables.close(writer, true);
}
return directory;
}