[JAVA-261]: GridFSInputFile.getMetaData() returns wrong value

Author: agirbal

src/main/com/mongodb/gridfs/GridFSFile.java

@@ -136,17 +136,25 @@ public Date getUploadDate(){
      * @return
      */
     public List<String> getAliases(){
-        return (List<String>)_metadata.get( "aliases" );
+        return (List<String>)_extradata.get( "aliases" );
     }
 
     /**
      * Gets the file metadata
      * @return
      */
     public DBObject getMetaData(){
-        return (DBObject)_metadata.get( "metadata" );
+        return (DBObject)_extradata.get( "metadata" );
     }
-    
+
+    /**
+     * Gets the file metadata
+     * @return
+     */
+    public void setMetaData(DBObject metadata){
+        _extradata.put( "metadata", metadata );
+    }
+
     /**
      * Gets the observed MD5 during transfer
      * @return
@@ -177,7 +185,7 @@ else if ( key.equals( "uploadDate" ) )
         else if ( key.equals( "md5" ) )
             _md5 = (String)v;
         else
-            _metadata.put( key , v );
+            _extradata.put( key , v );
         return v;
     }
 
@@ -198,7 +206,7 @@ else if ( key.equals( "uploadDate" ) )
             return _uploadDate;
         else if ( key.equals( "md5" ) )
             return _md5;
-        return _metadata.get( key );
+        return _extradata.get( key );
     }
 
     public void putAll( BSONObject o ){
@@ -232,7 +240,7 @@ public boolean containsField(String s){
     public Set<String> keySet(){
         Set<String> keys = new HashSet();
         keys.addAll(VALID_FIELDS);
-        keys.addAll(_metadata.keySet());
+        keys.addAll(_extradata.keySet());
         return keys;
     }
 
@@ -270,7 +278,7 @@ protected void setGridFS( GridFS fs ){
     long _chunkSize;
     Date _uploadDate;
     List<String> _aliases;
-    DBObject _metadata = new BasicDBObject();
+    DBObject _extradata = new BasicDBObject();
     String _md5;
 
     final static Set<String> VALID_FIELDS = Collections.unmodifiableSet( new HashSet( Arrays.asList( new String[]{ 

src/main/com/mongodb/gridfs/GridFSInputFile.java

@@ -88,14 +88,6 @@ public class GridFSInputFile extends GridFSFile {
         this( fs , null , null );
     }
 
-    @Override
-    public DBObject getMetaData() {
-        if ( _metadata == null ) {
-            _metadata = new BasicDBObject();
-        }
-        return _metadata;
-    }
-    
     /**
      * Sets the file name on the GridFS entry.
      *