fixed merge.

lelayf · Apr 26, 2012 · 91f42ef · 91f42ef
2 parents 0456cde + 1c9e30a
commit 91f42ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/jvm/backtype/cascading/tap/NullTap.java b/src/jvm/backtype/cascading/tap/NullTap.java
@@ -61,7 +61,7 @@ public NullTap() {
 
     @Override public TupleEntryCollector openForWrite(FlowProcess flowProcess, Object o)
         throws IOException {
-        return null;
+        throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override public boolean createResource(Object o) throws IOException {

diff --git a/src/jvm/backtype/cascading/tap/PailTap.java b/src/jvm/backtype/cascading/tap/PailTap.java
@@ -234,9 +234,9 @@ private void makeLocal(JobConf conf, Path qualifiedPath, String infoMessage) {
 
     @Override
     public void sinkConfInit(FlowProcess<JobConf> process, JobConf conf) {
-        if(_options.attrs!=null && _options.attrs.length > 0) {
+        if(_options.attrs!=null && _options.attrs.length > 0)
             throw new TapException("can't declare attributes in a sink");
-        }
+
         super.sinkConfInit(process, conf);
     }
 
@@ -290,4 +290,4 @@ public boolean equals(Object object) {
     private Path getQualifiedPath(JobConf conf) throws IOException {
         return getPath().makeQualified(getFileSystem(conf));
     }
-}
+}