You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2011/02/15 16:42:50 UTC
svn commit: r1070942 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
Author: mattmann
Date: Tue Feb 15 15:42:50 2011
New Revision: 1070942
URL: http://svn.apache.org/viewvc?rev=1070942&view=rev
Log:
- fix for OODT-142 TypeHandler SerDe is backwards incompat with older versions of FM
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1070942&r1=1070941&r2=1070942&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Feb 15 15:42:50 2011
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.3-SNAPSHOT (in progress)
--------------------------------------------
+* OODT-142 TypeHandler SerDe is backwards incompat with older
+ versions of FM (mattmann)
+
* OODT-141 LuceneCatalog pagination throws LuceneException when
grabbing out of bounds hitNum
Modified: oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java?rev=1070942&r1=1070941&r2=1070942&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java (original)
+++ oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java Tue Feb 15 15:42:50 2011
@@ -413,8 +413,10 @@ public final class XmlRpcStructFactory {
public static Hashtable<String, Object> getXmlRpcTypeHandler(TypeHandler typeHandler) {
Hashtable<String, Object> handlerHash = new Hashtable<String, Object>();
- handlerHash.put("className", typeHandler.getClass().getCanonicalName());
- handlerHash.put("elementName", typeHandler.getElementName());
+ handlerHash.put("className", typeHandler != null ?
+ typeHandler.getClass().getCanonicalName():"");
+ handlerHash.put("elementName", typeHandler != null ?
+ typeHandler.getElementName():"");
return handlerHash;
}
@@ -458,7 +460,8 @@ public final class XmlRpcStructFactory {
Hashtable<String, Object> typeHandlerHash) {
TypeHandler typeHandler = GenericFileManagerObjectFactory
.getTypeHandlerFromClassName((String) typeHandlerHash.get("className"));
- typeHandler.setElementName((String) typeHandlerHash.get("elementName"));
+ if(typeHandler != null)
+ typeHandler.setElementName((String) typeHandlerHash.get("elementName"));
return typeHandler;
}