Author: bpoussin Date: 2011-02-23 18:38:05 +0100 (Wed, 23 Feb 2011) New Revision: 737 Url: http://nuiton.org/repositories/revision/wikitty/737 Log: fix null pointer when attachment is not stored and we try to delete TreeNode Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-23 17:20:17 UTC (rev 736) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-23 17:38:05 UTC (rev 737) @@ -574,12 +574,14 @@ for (String attId : attachmentInTree.getRemoved().get(treeNodeId)) { SolrDocument oldDoc = attachments.get(attId); SolrInputDocument doc = solrResource.getAddedDoc(attId); - if (doc == null) { - doc = new SolrInputDocument(); - SolrUtil.copySolrDocument(oldDoc, doc); - solrResource.addDoc(attId, doc); + if (oldDoc != null || doc != null) { + if (doc == null) { + doc = new SolrInputDocument(); + SolrUtil.copySolrDocument(oldDoc, doc); + solrResource.addDoc(attId, doc); + } + doc.remove(TREENODE_ATTACHED + treeNodeId); } - doc.remove(TREENODE_ATTACHED + treeNodeId); } } for (String treeNodeId : attachmentInTree.getAdded().keySet()) {