You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/02/24 15:33:42 UTC

svn commit: r1293269 - /incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java

Author: olamy
Date: Fri Feb 24 14:33:42 2012
New Revision: 1293269

URL: http://svn.apache.org/viewvc?rev=1293269&view=rev
Log:
[DIRECTMEMORY-71] fix solr integration

Modified:
    incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java

Modified: incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java?rev=1293269&r1=1293268&r2=1293269&view=diff
==============================================================================
--- incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java (original)
+++ incubator/directmemory/trunk/integrations/solr/src/main/java/org/apache/directmemory/examples/solr/SolrOffHeapCache.java Fri Feb 24 14:33:42 2012
@@ -25,6 +25,7 @@ import org.apache.directmemory.measures.
 import org.apache.directmemory.measures.Ram;
 import org.apache.directmemory.serialization.Serializer;
 import org.apache.directmemory.serialization.SerializerFactory;
+import org.apache.directmemory.serialization.SerializerNotFoundException;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.SimpleOrderedMap;
 import org.apache.solr.core.SolrCore;
@@ -103,11 +104,19 @@ public class SolrOffHeapCache<K, V>
         String serializerClassName = (String) args.get( "serializerClassName" );
         if ( serializerClassName != null )
         {
-            Serializer serializer = SerializerFactory.createNewSerializer( serializerClassName );
-            if ( serializer == null )
+            Serializer serializer = null;
+            try
             {
-                serializer = SerializerFactory.createNewSerializer();
+
+                serializer = SerializerFactory.createNewSerializer( serializerClassName );
+            }
+            catch ( SerializerNotFoundException e )
+            {
+                // ignore and revert to default one
+                // TODO olamy log that ?
             }
+            serializer = SerializerFactory.createNewSerializer();
+
             cacheService.setSerializer( serializer );
         }