Permalink
Browse files

fixed issue where TupleSerialization was not seeing the current prope…

…rties config in some cases
  • Loading branch information...
1 parent 3c2fa35 commit 1114078252cc407b0895475e67900bd757f569cb @cwensel committed Apr 30, 2012
Showing with 6 additions and 6 deletions.
  1. +6 −6 src/hadoop/cascading/tuple/hadoop/TupleSerialization.java
@@ -131,7 +131,7 @@ public static String getSerializationTokens( Map<Object, Object> properties )
return TupleSerializationProps.getSerializationTokens( properties );
}
- static String getSerializationTokens( JobConf jobConf )
+ static String getSerializationTokens( Configuration jobConf )
{
return jobConf.get( TupleSerializationProps.SERIALIZATION_TOKENS );
}
@@ -181,7 +181,7 @@ public static void setSerializations( JobConf jobConf )
jobConf.set( HADOOP_IO_SERIALIZATIONS, Util.join( list, "," ) );
}
- static String getSerializations( JobConf jobConf )
+ static String getSerializations( Configuration jobConf )
{
return jobConf.get( HADOOP_IO_SERIALIZATIONS, null );
}
@@ -212,9 +212,9 @@ public TupleSerialization()
{
}
- public TupleSerialization( final FlowProcess<Object> flowProcess )
+ public TupleSerialization( final FlowProcess<JobConf> flowProcess )
{
- defaultComparator = getDefaultComparator( new Configuration()
+ super( new Configuration()
{
@Override
public String get( String name )
@@ -276,7 +276,7 @@ void initTokenMaps()
tokenClassesMap = new HashMap<Integer, String>();
classesTokensMap = new HashMap<String, Integer>();
- String tokenProperty = getSerializationTokens( (JobConf) getConf() );
+ String tokenProperty = getSerializationTokens( getConf() );
if( tokenProperty != null )
{
@@ -289,7 +289,7 @@ void initTokenMaps()
}
}
- String serializationsString = getSerializations( (JobConf) getConf() );
+ String serializationsString = getSerializations( getConf() );
if( serializationsString == null )
return;

0 comments on commit 1114078

Please sign in to comment.