From 0e4ba0360b8b71a39e00de6ffdc7c50037b3be81 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Tue, 25 Aug 2015 23:26:17 +0200
Subject: [PATCH] fix NPE on .yacyh result url of disconnected peer (cleanup
 yacyshare remaining)

---
 .../net/yacy/kelondro/data/meta/URIMetadataNode.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/net/yacy/kelondro/data/meta/URIMetadataNode.java b/source/net/yacy/kelondro/data/meta/URIMetadataNode.java
index 976bdd36c..511e571ee 100644
--- a/source/net/yacy/kelondro/data/meta/URIMetadataNode.java
+++ b/source/net/yacy/kelondro/data/meta/URIMetadataNode.java
@@ -691,7 +691,6 @@ public class URIMetadataNode extends SolrDocument /* implements Comparable<URIMe
                        SeedDB peers,
                        final TextSnippet textSnippet) {
         this.removeFields(CollectionSchema.text_t.getSolrFieldName()); // clear the text field which eats up most of the space; it was used for snippet computation which is in a separate field here
-        //this.indexSegment = indexSegment;
         this.alternative_urlstring = null;
         this.alternative_urlname = null;
         this.textSnippet = textSnippet;
@@ -708,8 +707,7 @@ public class URIMetadataNode extends SolrDocument /* implements Comparable<URIMe
                 try {
                     if (indexSegment.termIndex() != null) indexSegment.termIndex().remove(
                         Word.words2hashesHandles(Tokenizer.getWords(
-                            ("yacyshare " +
-                             path.replace('?', ' ') +
+                            (path.replace('?', ' ') +
                              " " +
                              this.dc_title()), null).keySet()),
                              this.hash());
@@ -717,10 +715,11 @@ public class URIMetadataNode extends SolrDocument /* implements Comparable<URIMe
                     ConcurrentLog.logException(e);
                 }
                 indexSegment.fulltext().remove(this.hash()); // clean up
+            } else {
+                this.alternative_urlstring = "http://" + address + "/" + host.substring(0, p) + path;
+                this.alternative_urlname = "http://" + seed.getName() + ".yacy" + path;
+                if ((p = this.alternative_urlname.indexOf('?')) > 0) this.alternative_urlname = this.alternative_urlname.substring(0, p);
             }
-            this.alternative_urlstring = "http://" + address + "/" + host.substring(0, p) + path;
-            this.alternative_urlname = "http://" + seed.getName() + ".yacy" + path;
-            if ((p = this.alternative_urlname.indexOf('?')) > 0) this.alternative_urlname = this.alternative_urlname.substring(0, p);
         }
         return this;
     }