hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r707260 - in /hadoop/core/branches/branch-0.18: ./ CHANGES.txt src/core/org/apache/hadoop/io/serializer/SerializationFactory.java
Date Thu, 23 Oct 2008 03:52:05 GMT
Author: acmurthy
Date: Wed Oct 22 20:52:04 2008
New Revision: 707260

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

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

Propchange: hadoop/core/branches/branch-0.18/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 22 20:52:04 2008
@@ -1 +1 @@
-/hadoop/core/trunk:699517,700163,704701,705420,705430
+/hadoop/core/trunk:699517,700163,704701,705420,705430,707258

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=707260&r1=707259&r2=707260&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Wed Oct 22 20:52:04 2008
@@ -44,6 +44,10 @@
     HADOOP-2421.  Add jdiff output to documentation, listing all API
     changes from the prior release.  (cutting)
 
+    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

Propchange: hadoop/core/branches/branch-0.18/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 22 20:52:04 2008
@@ -1 +1 @@
-/hadoop/core/trunk/CHANGES.txt:699517,700163,700923,704701,705420,705430
+/hadoop/core/trunk/CHANGES.txt:699517,700163,700923,704701,705420,705430,707258

Modified: hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java?rev=707260&r1=707259&r2=707260&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java
(original)
+++ hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/io/serializer/SerializationFactory.java
Wed Oct 22 20:52:04 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) {



Mime
View raw message