You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2008/10/23 05:50:41 UTC

svn commit: r707259 - in /hadoop/core/branches/branch-0.19: ./ CHANGES.txt src/core/org/apache/hadoop/io/serializer/SerializationFactory.java

Author: acmurthy
Date: Wed Oct 22 20:50:40 2008
New Revision: 707259

URL: http://svn.apache.org/viewvc?rev=707259&view=rev
Log:
Merge -r 707257:707258 from trunk to branch-0.19 to fix HADOOP-4467.

Modified:
    hadoop/core/branches/branch-0.19/   (props changed)
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java

Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 22 20:50:40 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=707259&r1=707258&r2=707259&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Wed Oct 22 20:50:40 2008
@@ -990,6 +990,10 @@
     HADOOP-3914. DFSClient sends Checksum Ok only once for a block. 
     (Christain Kunz via hairong)
  
+    HADOOP-4467. SerializationFactory now uses the current context ClassLoader
+    allowing for user supplied Serialization instances. (Chris Wensel via
+    acmurthy)
+ 
 Release 0.18.1 - 2008-09-17
 
   IMPROVEMENTS

Modified: hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java?rev=707259&r1=707258&r2=707259&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java (original)
+++ hadoop/core/branches/branch-0.19/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java Wed Oct 22 20:50:40 2008
@@ -51,16 +51,16 @@
     super(conf);
     for (String serializerName : conf.getStrings("io.serializations", 
       new String[]{"org.apache.hadoop.io.serializer.WritableSerialization"})) {
-      add(serializerName);
+      add(conf, serializerName);
     }
   }
   
   @SuppressWarnings("unchecked")
-  private void add(String serializationName) {
+  private void add(Configuration conf, String serializationName) {
     try {
       
       Class<? extends Serialization> serializionClass =
-        (Class<? extends Serialization>) Class.forName(serializationName);
+        (Class<? extends Serialization>) conf.getClassByName(serializationName);
       serializations.add((Serialization)
           ReflectionUtils.newInstance(serializionClass, getConf()));
     } catch (ClassNotFoundException e) {