svn commit: r1130212 - in /mahout/trunk: core/src/main/java/org/apache/mahout/math/VectorWritable.java math/src/main/java/org/apache/mahout/math/NamedVector.java

[srowen]

Author: srowen
Date: Wed Jun  1 16:35:44 2011
New Revision: 1130212

URL: http://svn.apache.org/viewvc?rev=1130212&view=rev
Log:
Partial fix for MAHOUT-546; avoid proximate cause which is an NPE

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
    mahout/trunk/math/src/main/java/org/apache/mahout/math/NamedVector.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java?rev=1130212&r1=1130211&r2=1130212&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java 
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/math/VectorWritable.java 
Wed Jun  1 16:35:44 2011
@@ -175,7 +175,8 @@ public final class VectorWritable extend
       }
     }
     if (named) {
-      out.writeUTF(((NamedVector) vector).getName());
+      String name = ((NamedVector) vector).getName();
+      out.writeUTF(name == null ? "" : name);
     }
   }
 

Modified: 
mahout/trunk/math/src/main/java/org/apache/mahout/math/NamedVector.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/NamedVector.java?rev=1130212&r1=1130211&r2=1130212&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/NamedVector.java 
(original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/NamedVector.java Wed 
Jun  1 16:35:44 2011
@@ -36,7 +36,7 @@ public class NamedVector implements Vect
   }
 
   public NamedVector(Vector delegate, String name) {
-    if (delegate == null) {
+    if (delegate == null || name == null) {
       throw new IllegalArgumentException();
     }
     this.delegate = delegate;